tata32
Merge branch 'master' of https://github.com/igloof/testGit

Conflicts:
	tp11/src/main/java/com/societe/blog/front/MasterDetailsManagedBean.java