Fixed databasemanager-call in main.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   CircleToUnlock.iml
#	modified:   Implementierung/CircleToUnlock/CircleToUnlock.iml
#	modified:   Implementierung/CircleToUnlock/build.gradle
#	modified:   Implementierung/CircleToUnlock/src/main/AndroidManifest.xml
#	modified:   Implementierung/CircleToUnlock/src/main/java/de/uniulm/circletounlock/Controller/PasswordValidation.java
#	modified:   Implementierung/CircleToUnlock/src/main/java/de/uniulm/circletounlock/MainActivity.java
#	new file:   Implementierung/CircleToUnlock/src/main/java/de/uniulm/circletounlock/SettingsActivity.java
#	modified:   Implementierung/CircleToUnlock/src/main/java/de/uniulm/circletounlock/View/Grid.java
#	modified:   Implementierung/CircleToUnlock/src/main/res/layout/activity_main.xml
#	modified:   Implementierung/CircleToUnlock/src/main/res/values/strings.xml
#	new file:   Implementierung/CircleToUnlock/src/main/res/values/strings_activity_settings.xml
#	new file:   Implementierung/CircleToUnlock/src/main/res/xml/pref_general.xml
#	modified:   Implementierung/Implementierung.iml
#	modified:   Implementierung/local.properties
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   CircleToUnlock.iml
#	modified:   Implementierung/.gradle/1.9/taskArtifacts/cache.properties.lock
#	modified:   Implementierung/.gradle/1.9/taskArtifacts/fileHashes.bin
#	modified:   Implementierung/.gradle/1.9/taskArtifacts/fileSnapshots.bin
#	modified:   Implementierung/.gradle/1.9/taskArtifacts/outputFileStates.bin
#	modified:   Implementierung/.gradle/1.9/taskArtifacts/taskArtifacts.bin
#	modified:   Implementierung/.idea/gradle.xml
#	modified:   Implementierung/.idea/misc.xml
#	modified:   Implementierung/.idea/vcs.xml
#	modified:   Implementierung/.idea/workspace.xml
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.idea/
#	Implementierung/.idea/.name
#	local.properties
Merge branch 'master' of https://github.com/stefan-karg/CircleToUnlock

Conflicts:
	Implementierung/CircleToUnlock/src/main/java/de/uniulm/circletounlock/MainActivity.java
Fixed reading preferences.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   CircleToUnlock.iml
#	modified:   Implementierung/CircleToUnlock/CircleToUnlock.iml
#	modified:   Implementierung/CircleToUnlock/build.gradle
#	modified:   Implementierung/CircleToUnlock/src/main/AndroidManifest.xml
#	modified:   Implementierung/CircleToUnlock/src/main/java/de/uniulm/circletounlock/Controller/PasswordValidation.java
#	modified:   Implementierung/CircleToUnlock/src/main/java/de/uniulm/circletounlock/MainActivity.java
#	new file:   Implementierung/CircleToUnlock/src/main/java/de/uniulm/circletounlock/SettingsActivity.java
#	modified:   Implementierung/CircleToUnlock/src/main/java/de/uniulm/circletounlock/View/Grid.java
#	modified:   Implementierung/CircleToUnlock/src/main/res/layout/activity_main.xml
#	modified:   Implementierung/CircleToUnlock/src/main/res/values/strings.xml
#	new file:   Implementierung/CircleToUnlock/src/main/res/values/strings_activity_settings.xml
#	new file:   Implementierung/CircleToUnlock/src/main/res/xml/pref_general.xml
#	modified:   Implementierung/Implementierung.iml
#	modified:   Implementierung/local.properties
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   CircleToUnlock.iml
#	modified:   Implementierung/.gradle/1.9/taskArtifacts/cache.properties.lock
#	modified:   Implementierung/.gradle/1.9/taskArtifacts/fileHashes.bin
#	modified:   Implementierung/.gradle/1.9/taskArtifacts/fileSnapshots.bin
#	modified:   Implementierung/.gradle/1.9/taskArtifacts/outputFileStates.bin
#	modified:   Implementierung/.gradle/1.9/taskArtifacts/taskArtifacts.bin
#	modified:   Implementierung/.idea/gradle.xml
#	modified:   Implementierung/.idea/misc.xml
#	modified:   Implementierung/.idea/vcs.xml
#	modified:   Implementierung/.idea/workspace.xml
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.idea/
#	Implementierung/.idea/.name
#	local.properties