commit for merge
Merge branch 'master' of https://github.com/zhangbobell/reportv2
Merge branch 'master' of https://github.com/zhangbobell/reportv2
completed all the modules include upload, initial screen, price control, privilege management.