new file:   application/src/main/scala/com/paris7/mayorpro/model/Specification.scala
	new file:   application/src/main/scala/com/paris7/mayorpro/model/Specification.scala~
	deleted:    application/src/main/scala/com/paris7/mayorpro/model/spec.xml
	modified:   application/src/main/scala/com/paris7/mayorpro/presentation/graphic/Interface.scala
	modified:   application/src/main/scala/com/paris7/mayorpro/presentation/graphic/ScalaFreme.scala
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro

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