Preferences
Merge branch 'master' of https://github.com/satornjanac/DroidConNLHachathon
Merging