setup auth~
fix merge conflicts
change error response to return json
change route errors to return json
Merge branch 'develop' of github.com:joeyhipolito/whim-essentials-lol into develop