initial mail2 commit
Merge branch 'master' into mail2

Conflicts:
	src/groovy/node/builder/bpm/GitMonitorTask.groovy
merged in mail branch and updated for configs