Merge pull request #29 from habeIchVergessen/preferences

fix unresolvable dependencies in preferences_general.xml
action bar title != android:title
fix real bad bug where it wouldn’t stop asking for device admin
Merge pull request #12 from durka/pref-cleanup

Pref cleanup