Pulling from transifex
Merge remote-tracking branch 'parent/master'
Working on import presets
Merge branch 'parent'