3.1

excel ok.
3.1
Messaging commit #1
Merge remote-tracking branch 'upstream/master' into PM

Conflicts:
	app/views/Application/index.html
	app/views/main.html