Merge branch 'cl'

Conflicts:
	src/main/resources/struts.xml
utf8
add sitemesh