Merge pull request #1228 from shackbarth/jsdoc

fix jsdoc

diff --cc lib/backbone-x/source/collection.js
Simple merge

diff --cc lib/backbone-x/source/model.js
Simple merge

diff --cc lib/backbone-x/source/model_mixin.js
Simple merge

diff --cc lib/backbone-x/source/workflow.js
Simple merge

diff --cc lib/enyo-x/source/views/grid_box.js
Simple merge

diff --cc lib/enyo-x/source/widgets/parameter.js
Simple merge