Add javadoc & refactoring
Revert "Add javadoc & refactoring"

This reverts commit 8fa1edc39380fe7bbca6404782acc6e511fe5ee2.
Merge branch 'develop' of https://github.com/pidupuis/MedicalCare.git into develop