date input modification
Merge branch 'develop' into staging

Conflicts:
	views/layout.html