Fixed legal page display
Merge remote-tracking branch 'origin/version_two'

Conflicts:
	assets/www/cch/modules/stayingwell/templates/legal.html
	src/org/digitalcampus/oppia/application/DbHelper.java