partly merged
Merge branch 'master' of github.com:mobile-km/edushare_mobile_app_demo
merged
some improvements in descs
Merge branch 'master' of github.com:mobile-km/edushare_mobile_app_demo
fully merged and desc improved