message_view changed
Merge branch 'master' of https://github.com/marcusglowe/checkmark
Implemented conversations while fixing lots of bugs.
Changed messages and templates
Merge branch 'master' of https://github.com/marcusglowe/checkmark

Conflicts:
	gr5/static/css/default.css