Change-Id: I626afcda2dfd47581877a75d5233ecafde85d40e

Conflicts:
	WebContent/ch3/app.js
	WebContent/ch3/index.html

Change-Id: I3752fc7c342ac89c26781467d7d09fb35cd8d8c2