Some other bugfixes
Merge branch 'master' of github.com:madetaille/care4care