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.