Fix saving comments for existing markers
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/javascripts/controllers/map-front.js
Fix for merge