updates to fix email approvals
Merge branch 'master' of https://github.com/csells/sb4

Conflicts:
	sbda/App.Config
removing app.config