Changed grunt-timer for time-grunt
Merge branch 'develop' into feature/consumer
Removed time-grunt as it conflicts with the mocha_istanbul task
Merge branch 'develop' into feature/consumer