Fixed bug where saving a map that has a diff layer fails. Also catching other similar cases
Fixing problems with the various date/time attribute types.
Fixed some issues with dateTime in conflict resolution.  Some work on time and date issues.
Added loading indicators to several areas of the UI.
Eliminated some hard-coded colors.