It's try to do
Merge branch 'master' of https://github.com/Gvinar/InfoMed

Conflicts:
	DataLayer/DataBaseModels/MainDataBaseModel.Designer.cs
	DataLayer/DataBaseModels/MainDataBaseModel.edmx
	DataLayer/DataBaseModels/TrashDataBaseModel.edmx
	InfoMed.sln
	InfoMed.suo
	MedProga/MedProga.csproj
Try to merge Test Console and Web App
Deleted temp file
Ignore suo
Merged with Annette