inbox fixed with ability to read individual messages
merge branch 'inbox'

Conflicts:
	www/js/controllers.js