Changes in pom for mail dependency
Basic Spring Security Framework. (Mostly config setting)
Merge remote-tracking branch 'origin/master'

Conflicts:
	shared/pom.xml