WCF test
Merge branch 'master' of https://github.com/MySmallfish/SAMS

Conflicts:
	src/Data/Sams.Designer.cs
	src/Data/Sams.edmx.diagram