Fixed Errors

Fixed a few errors in the controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/groupchat.py