test
Merge branch 'master' of https://github.com/meip/bettermeeting

Conflicts:
	app/controllers/Meetings.scala
User can now login, logout and signup in UI