Merge branch 'develop' into browser_app_polling
fix json handling of cmdline client
Merge branch 'browser_app_polling' into develop