Date format fix
Merge remote-tracking branch 'jee/master'

Conflicts:
	.idea/workspace.xml