another update
add codeing:utf-8
Merge branch 'dev' of github.com:zoe0505/lianzhao into dev
Merge branch 'dev'