Merge branch 'master' of https://github.com/SSilence/sum
- Commenting sum-frontend-messages.js
- Change updating conversationStatus in the conversationHeader
Merge branch 'master' of https://github.com/SSilence/sum

Conflicts:
	app/sum-frontend-messages.js
- Performance optimized (apply Hyphenator only on new TextMessages)
Merge branch 'master' of https://github.com/DaAndi82/sum
Fix: Hyphenator before Smileys
Remove hyphenator because performance problems
Merge branch 'master' of https://github.com/DaAndi82/sum
version 0.3.1
prepare version 0.4.0-SNAPSHOT