derby + little changes
Merge branch 'master' of https://github.com/Tool1990/HealthChronicle.git