4a2a889d46aa bundled webclient

afec901a0acd merged develop into this branch

2266b06e2fbc attempt at fixing bug