refactored events
Merge branch 'dev' of https://github.com/microhoods/microhoodsRefactor into features

Conflicts:
	client/app/map/map.js
Merge pull request #47 from maseh87/features

Features