- grunt integration
- fix lint errors
Merge remote-tracking branch 'origin/master'