refactoring
Merge branch 'develop'
fix readme
fix package.json and Gruntfile.js