csproj
Merge branch 'master' of https://github.com/mariasiuvlad/itec_edo

Conflicts:
	itec_edo/itec_edo/itec_edo.csproj