Notifications module - SMS done. (Check Db folder for updates)
Merge branch 'master' into dev