Merge branch 'feature/gruntfile' into develop