Update Model & Business
Merge branch 'master' of http://github.com/ziellim/Mayor-Pro

Conflicts:
	application/src/main/scala/com/paris7/mayorpro/business/Game.scala
	application/src/main/scala/com/paris7/mayorpro/model/Infrastructure.scala
	application/src/main/scala/com/paris7/mayorpro/model/Platform.scala