Volkan conflict2
Merge branch 'master' of https://github.com/aysenarm/LabProject

Conflicts:
	LabProject/LabProject/LabProject.pro.user