Updated version and changelog
Hopefully this will make assets work again on windows
Check if icon is in subdirectory
Conflicts:

	lib/Sabre/DAV/Browser/Plugin.php
Added CVE #
Merge branch '1.6' into 1.7

Conflicts:
	ChangeLog
	lib/Sabre/DAV/Version.php
1.7.7 release
Merge branch '1.7' into 1.8

Conflicts:
	ChangeLog
	lib/Sabre/DAV/Browser/Plugin.php
	lib/Sabre/DAV/Version.php
1.8.5 release.
Merge branch '1.8'

Conflicts:
	ChangeLog
	lib/Sabre/DAV/Browser/Plugin.php
	lib/Sabre/DAV/Version.php
Updated my homepage and set copyright statements to fruux.
Merge branch '1.7' into 1.8
Resolved all conflicts again.
Merge branch '1.8'

Conflicts:
	lib/Sabre/CalDAV/Backend/BackendInterface.php
	lib/Sabre/CalDAV/Version.php
	lib/Sabre/CardDAV/Version.php
	lib/Sabre/DAVACL/Version.php
	lib/Sabre/HTTP/Version.php