UserPreferences merged without app/lib and resources
Merge pull request #29 from Warrenty/master

UserPreferences merged without app/lib and resources