Merge pull request #1 from mv740/master

hihi
Merge pull request #2 from mv740/master

delete some useless files
commit
Merge pull request #3 from Pasgh/master

commit
updated email functions/controller to work with the new email table
- also added date to emails