Fix Github button :bug on feature branches
Fix Grunt watch task :bug to watch over scripts.js
Merge branch 'develop' into feature/data-hooks