try to push
Merge branch 'master' of https://github.com/poedja/SpaceTrek

Conflicts:
	SpaceTrek.v11.suo
Merge branch 'master' of https://github.com/poedja/SpaceTrek

Conflicts:
	SpaceTrek.v11.suo
	SpaceTrek/View/ObjectDetailPage.xaml.cs
Merge branch 'master' of https://github.com/poedja/SpaceTrek

Conflicts:
	SpaceTrek/View/CalendarPage.xaml
	SpaceTrek/View/ObjectListPage.xaml