Further restructuring

Added controllers for most of the almost everything. This is pretty big.
Not really sure what else to say about it.
Merge remote-tracking branch 'origin/master'

Conflicts:
	WorkInProgress/src/model/Ship.java