Added @json_params decorator
Cope with PY3.4 random dict ordering
Merge branch 'development' into workshop