BZ-12892: grunt tasks for ne-js repo
BZ-12892: jsformat
BZ-9999 comment change to stimulate merge commit
Merge remote-tracking branch 'origin/RC20140821' into release-candidate

* origin/RC20140821:
  BZ-9999 comment change to stimulate merge commit
  BZ-12892: jsformat
  BZ-12892: grunt tasks for ne-js repo

Conflicts:
	src/main/js/noesis/GoogleMapsUtils.js
	src/main/js/noesis/UriUtils.js