wtf
Merge branch 'develop' of github.com:snipe/snipe-it into develop
Fixing JSON parse errors from #97