Merge branch 'hotfix-1.1.1'
removed unnecessary files
Merge branch 'hotfix-1.1.2' into develop