first commit
Space modified
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/webroot/js/maps/GoogleMap/GoogleMap.library.js
	app/webroot/js/maps/jsMap.js
Merge remote-tracking branch 'origin/master'