Merge branch 'development'
Fix .travis.yml file
Fix Grunt config
Merge branch 'master' into development
Update README and package
Merge branch 'master' into development