Temporary reset
Merge branch 'master' of https://github.com/bigbosman007/SmartTimeManager

Conflicts:
	STmanager/Properties/Resources.Designer.cs
	STmanager/Properties/Resources.resx
	STmanager/frmMain.Designer.cs