modified some
Merge branch 'SimpleVersion' into hotfix

Conflicts:
	MetroExplorer/MetroExplorer/Pages/ExplorerPage/PageExplorerTimer.cs