Merge branch 'home-page'
Map comparison advances
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed

Conflicts:
	app/assets/stylesheets/custom.css.scss