Fixed security problem for windows machines.
Merge branch '1.6' into 1.7
Updated changelog
Merge branch '1.7' into 1.8

Conflicts:
	ChangeLog
	lib/Sabre/DAV/Browser/Plugin.php
Set release date
Merge branch '1.6' into 1.7

Conflicts:
	ChangeLog
Merge branch '1.7' into 1.8

Conflicts:
	ChangeLog
Merge branch '1.8'

Conflicts:
	ChangeLog
Merge branch 'master' into subscriptions
Lots of suggestions from @staabm