Modifications portail
Merge branch 'manhattan' of https://github.com/gdufrene/GamePortal into manhattan

Conflicts:
	src/manhattan/controller/ManhattanController.java