bugFix

Conflicts:
	assets/js/Map.js
	views/invit.html
Merge pull request #6 from rockdai/newBranch

bugFix