Merge branch 'add_grunt' into testing