Merge pull request #61 from bitbar/master

Master -> devel
TC-449 Add Calabash entities
Merge branch 'calabash' into devel

Conflicts:
	src/main/java/com/testdroid/api/APIEntity.java
	src/main/java/com/testdroid/api/model/APIProject.java
TC-452 #submit-for-devel-testing implemented
Merge pull request #62 from spawluk-bitbar/devel

TC-452 #submit-for-devel-testing implemented
Merge remote-tracking branch 'bitbar/devel' into devel

Issue #TC-476 - BuildConfig::fromAPI null pointer
crlf fix
crlf fix
crlf fix
Issue #TC-476 - BuildConfig::fromAPI null pointer
crlf fix
Issue #TC-476 - BuildConfig::fromAPI null pointer
crlf fix
Merge branch 'devel' of https://github.com/spawluk-bitbar/testdroid-api into devel

Conflicts:
	pom.xml
	src/main/java/com/testdroid/api/model/APITestRunConfig.java
crlf fix
crlf fix
crlf fix
TC-476
TC-476
Merge pull request #63 from spawluk-bitbar/devel

TC-476