temp
Merge branch 'IssueFixes14'

Conflicts:
	module/Message/Controller/messageCont.php