adding branch changes
trunk changes
Merge branch 'mybranch'

Conflicts:
	application.xml