merging
Merge branch 'master' of https://github.com/E-HealthTeam/ehealthPG_Android
Fixed persistenceManager
Merge
Merge branch 'master' of https://github.com/E-HealthTeam/ehealthPG_Android