asd
Merge branch 'dev' of https://github.com/sollecitom/spinthewheel.git
into dev

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/it.mc/spinthewheel/pom.properties