Test : Using the Engine timer to move the UnitSprite
Adding ids
id (suite)
ID + Moving Unit reading
Merge branch 'aurelie'

Conflicts:
	src/GameEngine/ArmyManager.java
	src/GameEngine/GameManager.java
	src/GameEngine/Unit.java
Button MapEditor OK
(MapEditor still not functionnal)
Delete MapEditor class
Add EditorToolBar and EditorScene instead
Merge branch 'thomas'
View - Test displaying image player
Merge branch 'aurelie'

Conflicts:
	src/View/ViewManager.java
AI can receive order
Editor - Choose file (beginning)
AI can now stock infos of the GameEngine
(and will use them later)
Merge branch 'thomas'
Editor - Drawing and erasing relief
Merge branch 'aurelie'
Preparation for moving units
Merge branch 'cecilia'

Conflicts:
	src/GameEngine/ArmyManager.java
	src/GameEngine/GameManager.java
Move units - part 1
Function proximityMapFindMin to help move units