feature init
new feature
Merge branch 'feature' into develop
Merge branch 'develop'
Merge branch 'feature' into develop
Merge branch 'develop'

Conflicts:
	WebRoot/WEB-INF/web.xml