fix buttons
Merge branch 'newmaster'

This reverts commit d43e585995c5d8a13bf84ef26e91c0a40cac3ef4.

Conflicts:
	roommeet-1/roommeet/bootstrap/gmap.js
	roommeet-1/roommeet/templates/meet.html
pyc