Behold! The tippiest of tools!
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	core/src/se300/destinytactics/game/mapgen/Sector.java
	core/src/se300/destinytactics/ui/ToolTip.java

FIXT