General Admin
Merge branch 'dev' of https://github.com/innoist/Clinic into dev

Conflicts:
	Clinic.Web/Clinic.Web.csproj