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

Conflicts:
	roommeet-1/roommeet/bootstrap/gmap.js
	roommeet-1/roommeet/forms.pyc
	roommeet-1/roommeet/templates/profile.html
	roommeet-1/roommeet/urls.pyc
	roommeet-1/roommeet/views.pyc