commented out datepicker
Merge branch 'develop' into staging

Conflicts:
	views/layout.html
Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'develop' into staging
changed theme.css