added appium and calabash ios types
added appium and calabash ios to jaxb
Merge branch 'appium' into devel
TC-1376 Added abort to test run
Merge pull request #243 from spawluk-bitbar/enterprise1.5.x

TC-1376 Added abort to test run
merge
TC-1623 - vncSupported for api device
TC-1621 Added end time to APIDeviceSession
Merge branch 'enterprise1.5.x' into devel
Merge pull request #250 from krzysiekbarca/devel

missed merge from enterprise branch with abort method
Merge pull request #252 from bitbar/devel

Devel
Merge branch 'devel' of github.com:spawluk-bitbar/testdroid-api into inspector
Merge branch 'devel' of github.com:bitbar/testdroid-api into devel
Merge branch 'devel' of github.com:spawluk-bitbar/testdroid-api into devel
Merge pull request #247 from szprutamich/inspector

TC-1623 - vncSupported for api device
Merge branch 'devel' of github.com:spawluk-bitbar/testdroid-api into devel
Merge pull request #253 from spawluk-bitbar/devel

TC-1621 Added end time to APIDeviceSession
Merge branch 'devel' of github.com:bitbar/testdroid-api into devel