TC-417 fixes
Merge
Merge branch 'master' of https://github.com/bitbar/testdroid-api into devel

Conflicts:
	pom.xml
Merge pull request #60 from spawluk-bitbar/devel

Devel -> master