Merge origin/master

Conflicts:
	pom.xml
Merge origin/master

Conflicts:
	pom.xml
Merge origin/master

Conflicts:
	pom.xml
Merge origin/master

Conflicts:
	pom.xml
Merge origin/master

Conflicts:
	pom.xml
Merge origin/master

Conflicts:
	Java.Addicted.Polumesa.Teliki-ejb/nb-configuration.xml
	Java.Addicted.Polumesa.Teliki-ejb/src/main/java/com/christidis/nick/ejb/business/processes/UserRegistrationSessionBean.java
	Java.Addicted.Polumesa.Teliki-ejb/src/main/java/com/christidis/nick/ejb/business/processes/UserRegistrationSessionBeanLocal.java
	Java.Addicted.Polumesa.Teliki-ejb/src/main/java/com/christidis/nick/entity/CategorieEntity.java
	Java.Addicted.Polumesa.Teliki-ejb/src/main/java/com/christidis/nick/entity/UserEntity.java
	Java.Addicted.Polumesa.Teliki-web/src/main/java/com/christidis/nick/beans/web/controller/RegisterUserController.java
	Java.Addicted.Polumesa.Teliki-web/src/main/java/com/christidis/nick/beans/web/converters/StringToDateConverter.java
	Java.Addicted.Polumesa.Teliki-web/src/main/webapp/register.xhtml
	pom.xml