searching
Merge branch 'master' of https://github.com/daboe01/Clinical

Conflicts:
	Clinical/public/Frontend/AppController.j
Merge branch 'master' of https://github.com/daboe01/Clinical