Signed-off-by: wael.aniba <wael.aniba@192.168.1.100>
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/edu/esprit/openshift/training/service/UserService.java
	src/main/webapp/welcome.xhtml