commit
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro

Conflicts:
	application/src/main/scala/com/paris7/mayorpro/presentation/graphic/Interface.scala
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro

Conflicts:
	application/src/main/scala/com/paris7/mayorpro/model/Villa.scala
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro

Conflicts:
	application/src/main/scala/com/paris7/mayorpro/presentation/graphic/Interface.scala