Refined Date time based on user Preference
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Web.config
Modified Tests
Merge branch 'master' of https://github.com/EdgeComputing/cats