delete!!!!!!
Merge branch 'master' of github.com:xebia/innovation-day-appium

Conflicts:
	appiumTest/build/classes/test/activityinstrumentation/SampleAppiumTest.class
	appiumTest/build/reports/tests/classes/activityinstrumentation.SampleAppiumTest.html
	appiumTest/build/reports/tests/index.html
	appiumTest/build/reports/tests/packages/activityinstrumentation.html
	appiumTest/build/test-results/TEST-activityinstrumentation.SampleAppiumTest.xml
	appiumTest/build/test-results/binary/test/results.bin