bump default timeout to 15s
Merge from upstream
Merge remote-tracking branch 'upstream/master' into search-method
Merge pull request #13 from APMG/php-unit-tests

Php unit tests
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	lib/Pmp/Sdk/CollectionDocJson.php
Merge pull request #14 from APMG/search-method

Increase default timeout
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from APMG/master

Misc fixes
Merge branch 'master' into composer