Merge branch 'hotfix/2.0.1'
Added import script to admin
Added TomTom logo
Fixed merge conflicts