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

Conflicts:
	src/main/java/it/mc/spin/presentation/html/BaseController.java