no message
Merge branch 'master' of https://github.com/myhealthcare/site

Conflicts:
	app/controllers/AddClientController.php
	app/views/clients/add.blade.php