ENYO-3311: tabified
ENYO-3311: Merge remote-tracking branch 'origin/master' into ENYO-3311

Conflicts:
	services/source/phonegap/PhonegapUIRows.js
	services/source/phonegap/ProjectProperties.js
ENYO-3311: formatted comment
Merge pull request #763 from enyojs/ENYO-3311

ENYO-3311: tabified files that were untabified by js_beautifier