Merge branch 'master' into mike
same old category and provider blade editing
Merge branch 'master' into mike
Optimizing views/pages
Merge pull request #38 from sweetrocker22/mike

Mike