change documentroot
Merge branch 'release/1.1'
release 1.1