Merge branch 'master' of https://github.com/eltonio450/modal.git

Conflicts:
	src/RelationsPubliques/Global.java
Merge branch 'master' of https://github.com/eltonio450/modal.git
Merge branch 'master' of https://github.com/eltonio450/modal.git