minor
Merge branch 'develop'

Conflicts:
	src/struts.xml