Merge branch 'develop' of https://github.com/FACT-Finder/FACT-Finder-PHP-Framework into develop
Merge branch 'master' of https://github.com/FACT-Finder/FACT-Finder-PHP-Framework
Merge branch 'master' into develop
Merge branch 'release'
Merge branch 'release'
Added Release Notes
Merge branch 'release'
Integrate revamped tracking
Merge branch 'develop' of https://github.com/FACT-Finder/FACT-Finder-PHP-Framework into develop
Merge remote-tracking branch 'remotes/eamonn/master' into develop

Conflicts:
	lib/FACTFinder/Xml69/TrackingAdapter.php

Merged Eamonn's changes for the new tracking API. Still WIP!