chat improved
chat improved 2
change securityManagedBean
Merge origin/master

Conflicts:
	ES09-MerLION-war/nbproject/build-impl.xml
	ES09-MerLION-war/nbproject/genfiles.properties
	ES09-MerLION-war/nbproject/project.properties
Merge origin/master

Conflicts:
	ES09-MerLION-war/web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	ES09-MerLION-war/web/WEB-INF/web.xml
Merge origin/master

Conflicts:
	ES09-MerLION-war/web/WEB-INF/web.xml
Merge origin/master
delete managedbeans