new_verstkf
Merge branch 'new_verst' into develop

Conflicts:
	app/assets/javascripts/messages.js
	app/views/message/_dialog.html.haml