Create factory for markers
Merge branch 'master' of https://github.com/hermanzamula/CommentsTravel

Conflicts:
	application/javascripts/controllers/map-front.js