update deploy script
added email configuration
Merge branch 'master' into bps

Conflicts:
	Foundation.hs