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
Merge remote-tracking branch 'bitbar/devel' into devel
Merge remote-tracking branch 'bitbar/devel' into devel

Conflicts:
	src/main/java/com/testdroid/api/model/APITestRunConfig.java
TC-449 Rename CALABASH_ANDROID to CALABASH
Add Calabash classes to xml annotations
Merge remote-tracking branch 'bitbar/devel' into devel
Merge remote-tracking branch 'bitbar/devel' into devel
Merge remote-tracking branch 'bitbar/devel' into devel
Merge pull request #72 from spedepekka/devel

TC-449 Add Calabash entities