Move from timex
Merge branch 'master' of github.com:ARMO-Systems/ArmoGet

Conflicts:
	Source/ArmoLib/ArmoLib.csproj