Added mail-related properties to default
Merge branch 'develop' of github.com:arrayexpress/annotare2 into exportSubmission_kolais
Added messaging on submission and on rejection
Merge branch 'exportSubmission_kolais' of github.com:arrayexpress/annotare2 into exportSubmission_kolais

Conflicts:
	app/web/src/main/java/uk/ac/ebi/fg/annotare2/web/server/services/SubsTrackingWatchdog.java
Merge branch 'develop' of github.com:arrayexpress/annotare2 into exportSubmission_kolais
FU, git!
Override all the mess I've created last two days