mouhahahhaahahaha
Merge branch 'master' of https://github.com/titiyo/gameGeneratorMVC

Conflicts:
	Content/xml/users.xml
Modify Situation