Merge remote-tracking branch 'origin/phase1' into phase1

Conflicts:
	src/main/webapp/WEB-INF/views/home.jsp