Merge branch '1.7' of github.com:fruux/sabre-dav into 1.7
Preparing for release.
Removed phing and created super simple build script.
Missing vobject note
Merge branch '1.8' of github.com:fruux/sabre-dav into 1.8
Updated changelog.
Merge branch '1.7' into 1.8

Conflicts:
	ChangeLog
	build.xml
	composer.json
	lib/Sabre/DAV/Version.php
Merge branch '1.8'

Conflicts:
	ChangeLog
	build.xml