TEMP
Temp
Timers functionality implemented (Timer approving is not implemented)
Temp
Temp
Temp
Conflicts:
	AELITA/Aelita PSA Quick TE Tracker.csproj
	AELITA/App.config
	AELITA/DataStorage/LocalDataStorage.cs
	AELITA/Forms/MainRibbonForm.Designer.cs
	AELITA/Forms/MainRibbonForm.cs
	AELITA/Forms/MainRibbonForm.resx
	AELITA/GridUserActions/UserActions/UserActionAdd.cs
	AELITA/GridUserActions/UserActions/UserActionApproveDate.cs
	AELITA/GridUserActions/UserActions/UserActionDelete.cs
	AELITA/GridViewObjects/EditorsControl/CostsControl/CostEventsFilterFunction.cs
	AELITA/GridViewObjects/ViewObjects/CostSignViewObject.cs
	AELITA/GridViewObjects/ViewObjects/GridViewObject.cs
	AELITA/GridViewObjects/ViewObjects/SignerViewObject.cs
	AELITA/GridViewObjects/ViewObjects/TimersViewObject.cs
	AELITA/Properties/Resources.Designer.cs
	AELITA/Properties/Resources.resx
	AELITA/Properties/Settings.Designer.cs
	AELITA/Properties/Settings.settings
	AELITA/Resources/Strings/TableColumns/GlobalColumns.resx
	AELITA/Resources/Strings/TableColumns/TimersTableColumns.Designer.cs
	AELITA/Resources/Strings/TableColumns/TimersTableColumns.resx
	AELITA/Resources/Strings/TableColumns/UsersTableColumns.resx
	AELITA/TransitionControl/Connection/RemotePoints/HttpRemotePoint.cs
	AELITA/TransitionControl/Connection/Transmitters/HttpTransmitter.cs
Merge branch 'optimization' of https://github.com/sholtun/TE-Tracker into optimization