Added grunt
Added grunt
Added grunt
Added grunt + new folder layout
Merge branch 'dev'