replaced chapter with entry
Merge branch 'master' of github.com:mobile-km/edushare_mobile_app_demo

Conflicts:
	app/views/b3/index.html.haml