Change userprefs
Add .userprefs to gitignor
Merge branch 'master' into develop