modified date display
Merge branch 'development' of https://github.com/bashantad/Industry-project into development
conflict resolved