Merge branch 'master' into pref

Conflicts:
	AndroidManifest.xml
	src/android/jimtahu/passgen/PassGen.java
Merge branch 'pref' of github.com:jimtahu/PassGen into pref

Conflicts:
	src/android/jimtahu/passgen/PassGen.java