Preference fix voor Android 2.x, en #80
Merge remote-tracking branch 'origin/development' into development