UserPreferences merged without app/lib and resources

We still need to add all the files from app/lib and resources folders