Upsets now use json instead of xml
Forgot to add client side modifications
Merge branch 'jsonify_upsets' into develop