Merge branch 'feature/gruntfile' into develop
Merge pull request #4 from eltuctuc/develop

Merge branch 'feature/gruntfile' into develop