Adds email and sms notification system
Updates config file for notification system
Merge branch 'master' into notification-system

Conflicts:
	config/index.js.cast5