BZ-12892: jsformat
Merge remote-tracking branch 'origin/RC20140821' into integration

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