Merge pull request #10 from clinuz/master

updates
Fixed obsolete filename in comment. Enyo-DCO-1.1-Signed-off-by: Jim Tang <jim.tang@palm.com>
Comment cleanup. Enyo-DCO-1.1-Signed-off-by: Jim Tang <jim.tang@palm.com>
Additional refinement of comments. Enyo-DCO-1.1-Signed-off-by: Jim Tang <jim.tang@palm.com>
Comment cleanup. Enyo-DCO-1.1-Signed-off-by: Jim Tang <jim.tang@palm.com>
Minor edits to comments
fixed conflicting changes

Merge branch 'enyo'

Conflicts:
	source/controllers/DocumentsController.js
	source/models/Scaffold.js