cleanup
Merge branch 'master' of github.com:innoq/statuses

Conflicts:
	src/statuses/views/main.clj
cleanup