normal
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/roommeet/bootstrap/gmap.js