Updated gitignore
Added platform and plugins folders
Merge branch 'master' into feature/Compass