no message
Merge branch 'master' of https://github.com/Trailfinders/rugby

Conflicts:
	controllers/admin.js