fix merge conflicts

Signed-off-by: Justin Lee <lis186@gmail.com>
web editor bug fixed.

Signed-off-by: Justin Lee <lis186@gmail.com>
Add qrcode to web editor.

Signed-off-by: Justin Lee <lis186@gmail.com>
Add QRcode scanning function.

Signed-off-by: Justin Lee <lis186@gmail.com>