maj maj de minuit 30
Merge branch 'spring_int_fix' of https://github.com/newkek/codelicious.git into spring_int_fix

Conflicts:
	WebContent/main.xhtml