Merged free and occupied state icons on ship map for animation
Merge branch 'Developer' into CollisionDetecting