wdh
Merge branch 'dennis'

Conflicts:
	alas/src/main/webapp/client/client.jsp
	alas/src/main/webapp/client/js/chat.js