Merge pull request #45 from mLuby/dev

Fixed JSHint errors & made 'grunt' work.