Creating template
Merge branch 'master' of github.com:m20o/xfeedback

Conflicts:
	build.sbt
	conf/application.conf
	project/plugins.sbt