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
Merge pull request #69 from krzysiekbarca/devel

TC-543 #implemented proxy support in API
Add Calabash classes to xml annotations
Merge remote-tracking branch 'bitbar/devel' into devel
Merge pull request #70 from krzysiekbarca/devel

TC-490 fixed uploading file when use authenticated proxy
Merge remote-tracking branch 'bitbar/devel' into devel
Added APIView class, annotated APIDevice with new views
Merge branch 'devel' of https://github.com/bitbar/testdroid-api into devel

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

Added APIView class, annotated APIDevice with new views
Merge remote-tracking branch 'bitbar/devel' into devel
Merge pull request #72 from spedepekka/devel

TC-449 Add Calabash entities
Version update
Merge pull request #73 from spedepekka/devel

Version update
TC-498 #submit-for-devel-testing fix api search phrase
TC-505 throw exceptions containing IOException message
Merge pull request #75 from spawluk-bitbar/devel

TC-505 throw exceptions containing IOException message