Merge branch 'develop' of https://github.com/FACT-Finder/FACT-Finder-PHP-Framework into develop
Added changes in new Tracking API to JSON adapter and test, too.