Bug fixes

Bug fixes
Bug Fixes

Bug Fixes
Date format changes

Date format changes
Format change

Format change
tested duplicate check

tested duplicate check
fixed errors on view details

fixed errors on view details
update history

update history
resolved confilicts

resolved confilicts
Merge remote-tracking branch 'origin/1.1bug_fixes'
Merge remote-tracking branch 'origin/master' into 1.1bug_fixes
Commit resolved conflicts

Commit resolved conflicts