update
Merge branch 'master' of github.com:qrdemo/qrdemo
update