Merge branch 'Unity-4.5-Upgrade'
Merge branch 'master' of https://github.com/nickmudry/Lost-In-Space