Changing branch

Commit pour changer de branche
Merge branch 'master' of https://github.com/burrich/Forum

Conflicts:
	Forum/nbproject/build-impl.xml
	Forum/nbproject/genfiles.properties
	Forum/nbproject/project.properties
	Forum/nbproject/project.xml