Controllers
Merge branch 'master' of ssh://git@github.com/mxbeaulieu/hypermedia.git

Conflicts:
	FunFlash/src/main/webapp/WEB-INF/jsp/gameLayout/playGame.jsp