tes
Merge branch 'master' of https://github.com/alexandreMarquis/workspace

Conflicts:
	mapEditor/src/MapModel.java
	mapEditor/src/TileSelectorView.java