changes regarding upload
Merge branch 'master' of https://github.com/poedja/SpaceTrek

Conflicts:
	SpaceTrek.v11.suo