Fixing problems with git
Merge branch 'new_branch_name'

Conflicts:
	src/main/resources/com/syncron/jenkinsci/plugins/customiframeportlet/CustomIframePortlet/config.jelly