Merge branch 'develop'
Hotfix-xcuserstate: stopped tracking xcuserstate

Added an exception in ~/.gitignore_global to ignore *.xcuserstate.
Merge branch 'hotfix-xcuserstate' into develop