init
Merge branch 'master' of
https://github.com/poireauxvinaigrette/poireauxvinaigrette.git

Conflicts:
	build.sbt
	conf/play.plugins
	project/build.properties
	project/plugins.sbt