Merge branch 'master' of https://github.com/jjunk/lms299

Conflicts:
	controllers/groupchat.py