Merge branches 'master' and 'dev'
Merge branches 'master' and 'dev'
Merge branches 'master' and 'dev'
Changed the importing format of JS files
Removed the duplicate titles
Merge branches 'dev' and 'master' into dev