Merge branch 'master' of https://github.com/inkku/Starproject

Conflicts:
Assets/Scenes/Starlevel1.unity
Merge branch 'master' of https://github.com/inkku/Starproject