Added rooms
Merge branch 'master' of https://github.com/patdohere/WebJam2013
move templates into views