Messaging updates.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Messages.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	Messages.php
	ic.js
Merge branch 'master' of https://github.com/vtb104/SWENG500