required field(name and code)
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
added email page
added email menu