edit message controller
Merge remote-tracking branch 'origin/master' into group1-3

Conflicts:
	.gitignore