try git with sublime text plugin
delete old folder and try to fix Google Analytics
Merge branch 'develop'