Merge branch 'release/1.3.36'
merging release/1.3.36' into master
Merge branch 'master' of https://github.com/bitbar/testdroid-api
review fix
Merge branch 'master' of https://github.com/bitbar/testdroid-api

Conflicts:
	src/main/java/com/testdroid/api/DefaultAPIClient.java
Merge branch 'master' of https://github.com/bitbar/testdroid-api
Merge pull request #129 from spawluk-bitbar/master

devel -> master
remove project type from api sort breaking search/sort
Merge pull request #158 from kajdus/master

remove project type from api sort breaking search/sort
Merge branch 'master' of https://github.com/bitbar/testdroid-api
Merge branch 'master' of https://github.com/bitbar/testdroid-api
API Search fixes
review fix
Merge pull request #159 from spawluk-bitbar/master

API Search fixes
Merge branch 'master' of https://github.com/bitbar/testdroid-api
merge with master branch from bitbar-github