Merge branch 'release-6.0rc2'
Merge branch 'master' into develop
Merge branch 'style-guide' into develop
removed unnecessary files
Merge branch 'develop' into feature-plaggable-card