Fix JSHint
Merge branch 'grunt' into develop