Implemented the basic asset types for Combat Units and Squads. A basic editor for each has been implemented.

Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>
Updated CombatUnit.cs and UnitEditor.cs to handle unit slots and unit space.

Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>
Merge branch 'master' of github.com:Tactibru/Game

Conflicts:
	Assembly-CSharp.pidb (should now be ignored, but must be removed!)

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>
Fixed issue with auto-merge.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>
Merge pull request #14 from Minalien/master

Fixed merge issues, deleted Assembly-CSharp.pidb