lots of changes in order to try get cdi running
Merge branch 'ticket351560' of https://github.com/sasfeld/JumpUpReloaded into ticket351560

Conflicts:
	src/main/java/de/htw/fb4/imi/jumpup/user/registration/AbstractRegistrationMethod.java