first scala try
Merge branch 'origin/dev'

Conflicts:
	app/controllers/Application.scala
	conf/routes
Merge branch 'origin/dev'
add honeypot and hidden input to form
update message_de set html_entitites