+ viewer
Merge branch 'master' of https://github.com/poedja/SpaceTrek

Conflicts:
	SpaceTrek.v11.suo
	SpaceTrek/MainPage.xaml.cs
	SpaceTrek/Model/SpaceObjectOccurence.cs
	SpaceTrek/View/ObjectListPage.xaml.cs