file comment
Merge branch 'forum' of https://github.com/valleybay/modulus into forum

Conflicts:
	build/web/WEB-INF/classes/no/uia/slit/web/uistrings.properties
	build/web/WEB-INF/classes/no/uia/slit/web/uistrings_en.properties
	src/java/no/uia/slit/auth/AuthBean.java