moep
Merged 'dev'.
Finish messaging
Merged 'dev'.

Conflicts:
	app/less/base.less
Finish gui-talks-cam-293
update positioning left and right messages