View - Test displaying image player
Merge branch 'aurelie'

Conflicts:
	src/View/ViewManager.java
Merge branch 'thomas'
AI can now send units to the closest base