Implemented encryption method list to disable password field if specific method is not chosen
Test merge
Updated settings.xml and removed/revised methods in SettingsActivity with setting a password
Added another password field: one for private key access, another for private key encryption. Updated Strings.xml as well
Merge branch 'master' of https://github.com/fatso113/Android-Vanity-Generator

Conflicts:
	app/src/main/java/com/fatsolabs/vanitygenerator/SettingsActivity.java