Added DroidPrefs.
Merge branch 'feature/droidprefs' into develop
Merge branch 'develop'