changed date format
Merge branch 'master' of https://github.com/INF5750-gitignore/dhis2-app-messaging

Conflicts:
	js/application.js
	messagelist.html