1. edit js not  validation
2. data 05 22
Merge branch 'master' of https://github.com/DormitoryTeam/Dormitory