Merge branch 'master' of git.zetetic.net:/sqlcipher-android-test

Conflicts:
	net.zetetic.sqlcipher.test.iws

Author: developernotes