[UPDATE] grunt update, minor changes
Merge branch 'development'
Merge branch 'master' into development