start merging
Merge branch 'master' of github.com:mobile-km/edushare_mobile_app_demo
split web demo work
Merge branch 'master' of github.com:mobile-km/edushare_mobile_app_demo