Unactivated changed by Pending
fix bootstrap.min.css, alert component and fixed connection shortcut !
fix bootstrap.min.css, alert component and fixed connection shortcut !
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-ejb/nbproject/project.properties
	HomeCinema-ejb/src/java/ejbs/user/ManageUser.java
	HomeCinema-ejb/src/java/managers/dtos/UserDtoManager.java
	HomeCinema-lib/src/ejbs/ManageUserRemote.java
	HomeCinema-war/src/beans/LoginManagedBean.java
	HomeCinema-war/web/components/header.xhtml
	HomeCinema-war/web/css/main.css.map
	HomeCinema-war/web/moncompte.xhtml
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-ejb/nbproject/project.properties
	HomeCinema-ejb/src/java/ejbs/user/ManageUser.java
	HomeCinema-ejb/src/java/managers/dtos/UserDtoManager.java
	HomeCinema-lib/src/ejbs/ManageUserRemote.java
	HomeCinema-war/src/beans/LoginManagedBean.java
	HomeCinema-war/web/components/header.xhtml
	HomeCinema-war/web/css/main.css.map
	HomeCinema-war/web/moncompte.xhtml