Merge remote-tracking branch 'upstream/master'

Conflicts:
	css/style.css
	docs/evlist.html
	language/dutch_utf-8.php
	public_html/js/calselect.js
	templates/addeventoption.thtml
	templates/centerblock.thtml
	templates/dayview/column.thtml
	templates/dayview/dayview.thtml
	templates/dayview/dayview_print.thtml
	templates/dayview/singleevent.thtml
	templates/monthview/monthview.thtml
	templates/monthview/monthview_print.thtml
	templates/weekview/events.thtml
	templates/weekview/weekview.thtml
	templates/weekview/weekview_print.thtml