test
Merge branch 'master' of https://github.com/gbgteam/PhotoGBG

Conflicts:
	DataAccess/obj/Debug/DataAccess.csproj.FileListAbsolute.txt
	PhotoGBG.v11.suo