Merge branch 'master' into jungchoco

Conflicts:
	src/main/webapp/home.htm