fix crash when updating from older version with Preferences Bug
work around Scrypt Verify Error at login, check password fields for emptyness in VerifyPasswordPreference
use Snackbar instead of Crouton
gradle plugin update
categories feature
remove some java and lint warnings
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build.gradle
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values-de/strings.xml
	app/src/main/res/values/strings.xml
forgot graphics
Merge remote-tracking branch 'origin/master'
sort order ignores case
fix crash due to double registration on otto bus