refactoring completed
Merge branch 'master' of https://github.com/m1cros/HospitalJADE