Merge branch 'master' into release

Conflicts:
	.gitignore
	README.md
	android_device/src/instrumentTest/java/com/wit/and/device/test/AndroidDeviceTest.java