moment changes and inbox and message styling
merged merge branch 'messagefix'

Conflicts:
	www/js/controllers.js