conditions model and admin created
Merge branch 'master' of https://github.com/DiUS/myhealth