frontend commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	upark_141119/src/main/webapp/js/controller/map_ctrl.js