Match environment to ARSnova backend changes
Merge branch 'master' of scm.thm.de:commana/arsnova-vagrant

Conflicts:
	puppet/modules/arsnova/templates/start.sh.erb