Merge pull request #290 from snieguu/devel

https://jira.bitbar.com/browse/TD-178
https://jira.bitbar.com/browse/TD-250
Merge branch 'devel' of github.com:bitbar/testdroid-api into devel