prout
Merge branch 'master' of https://github.com/DEVINT2014-HUGO/HUGO

Conflicts:
	Projet/src/controler/Controler.java
Merge branch 'master' of https://github.com/DEVINT2014-HUGO/HUGO

Conflicts:
	Projet/src/controler/Controler.java
Merge branch 'master' of https://github.com/DEVINT2014-HUGO/HUGO
Merge branch 'master' of https://github.com/DEVINT2014-HUGO/HUGO