added grunt, fixed issue #36
Merge branch 'dev'