Persistence thing, rock counter restorer and stopwatch
Merge branch 'aviation'

Conflicts:
	CompressedImageView/MainWindow.xaml
	CompressedImageView/MainWindow.xaml.cs
	CompressedImageView/_THE_UI.csproj
	ROS_dotNET.sln
                ...... and more