some tables added
calendar controller added
Email DB issue is fixed. Edit form works fine now
merge
merge