Work
Merge branch 'master' of https://github.com/Jamnic/component-concepts

Conflicts:
	map.concept/src/map/concept/FieldGraphics.java
	map.concept/src/map/panels/map/MapPanel.java
	map.concept/src/sprites/SpriteType.java