Merge branch 'master' into release

Conflicts:
	README.md
	and_database/src/instrumentTest/java/com/wit/android/database/BaseDatabaseProviderTest.java