css managed in popup view
Merge remote-tracking branch 'origin/master'

Conflicts:
	contents/scripts/datepicker.js