update
Merge branch 'dev' of github.com:qrdemo/qrdemo-server into dev