Merge origin/master

Conflicts:
	src/main/java/com/efsf/sf/bean/consultant/ConsultantSettingsMB.java
	src/main/webapp/client/clientNewApplication.xhtml