Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Added package.json to the grunt task
Merge branch 'dev'
Merge branch 'master' into fellmeister