Settings.apk 2400-FINAL

Settings.apk finished
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dutch/main/Settings.apk/res/values-nl/strings.xml