Fixed json
Merge branch 'sam' of https://github.com/JFrei86/hwserver into develop