add email templates, fix UserDao
Merge branch 'dev' of https://github.com/hieunguyen/tuongky into dev