add  datepicker in settings
fix conflict
Merge branch 'master' of https://github.com/School-of-Innovation-Experiment/provinceManagement
add send email module