;;;
merge
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-ejb/nbproject/build-impl.xml
	HomeCinema-ejb/nbproject/genfiles.properties
	HomeCinema-ejb/src/java/entities/UserRetrieve.java
	HomeCinema-lib/src/exception/RetrieveCodeException.java
	HomeCinema-lib/src/exception/UnknownAccountException.java
	HomeCinema-war/src/beans/ForgotPassManagedBean.java
	HomeCinema-war/web/css/style-404.css
	HomeCinema-war/web/forgot_pass.xhtml
	HomeCinema-war/web/js/404.js
	HomeCinema-war/web/retrieve_pass.xhtml