Merge branch 'master' of https://github.com/alikaraki/Shafam

This reverts commit c112a1e3074a4cf3eafbbd919c26e94824d4d1ab.

Conflicts:
	Shafam.DataAccess/ContainerConfigurator.cs
	Shafam.DataAccess/Shafam.DataAccess.csproj
Merge branch 'master' of https://github.com/alikaraki/Shafam

Conflicts:
Shafam.BusinessLogic/ContainerConfigurator.cs
Shafam.DataAccess/Repositories/DoctorRepository.cs
Resolving conflicts