angular
Inbox page markup
Merge branch 'master' of github.com:vslinko/translation-typesetting

Conflicts:
	index.coffee