NothingToDo Complit
Merge branch 'master' of https://github.com/LifeManagement/Web

Conflicts:
	LifeManagement/App_Data/DefaultConnection.mdf
	LifeManagement/App_Data/DefaultConnection_log.ldf
	LifeManagement/LifeManagement.csproj