Merge branch 'gesture_lock' of github.com:Logan676/seadroid into gesture_lock

Conflicts:
	AndroidManifest.xml
	src/com/seafile/seadroid2/SettingsManager.java
	src/com/seafile/seadroid2/gesturelock/LockPatternView.java
	src/com/seafile/seadroid2/ui/SettingsPreferenceFragment.java
Merge branch 'gesture_lock' of github.com:Logan676/seadroid into gesture_lock