add feature y
add bugfix y
Merge branch 'develop' into feature_y

Conflicts:
	WebRoot/WEB-INF/web.xml
Merge branch 'develop'

Conflicts:
	WebRoot/WEB-INF/web.xml