active admin now installed
Merge branch 'master' of https://github.com/DiUS/myhealth

Conflicts:
	Gemfile.lock