Quick fix for displaying errors
Merge branch 'web-rewrite'
Merge branch 'master' of github.com:BishopFox/iSpy