bind webapp to version/0.6 branch
Merge remote-tracking branch 'origin/develop' into pixelated/develop