#int-6 fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/pages/jquery.gmap.js