userprefs update
Merge branch 'OSX'
Merge remote-tracking branch 'origin/master' into Sabretooth-experimental
cleanup after merge PC

new meta files for textures in the mobile folder dir deleted
ignore updated for mobile folder
userprefs update
new merge from sabretooth
cleanup after merge PC

new meta files for textures in the mobile folder dir deleted
ignore updated for mobile folder
Merge remote-tracking branch 'origin/PC-Sabretooth'
Meta files deleted
new merge from sabretooth
Meta files deleted
Merge remote-tracking branch 'origin/PC-Sabretooth' into Sabretooth-experimental
mobile assets removed
gitignore upated
gitignore cleanuped
Merge remote-tracking branch 'origin/PC-Sabretooth'
Merge branch 'master' into OSX