修
Merge branch 'master' of github.com:mobile-km/edushare_mobile_app_demo

Conflicts:
	app/models/section.rb
Merge branch 'master' of github.com:mobile-km/edushare_mobile_app_demo
added #number