Added template tag for rooms
Merge branch 'master' of github.com:rakhmatulin/hackathon14

Conflicts:
	templates/map.html