Unit stuff added
Merge branch 'master' of https://github.com/NabsterHax/AdvancedTBS

Conflicts:
	Globals.h