Merge remote-tracking branch 'origin/master'

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