Competition Registration
Merge branch 'master' of https://github.com/MySmallfish/SAMS

Conflicts:
	src/Sams.Services/Config.DataServices.cs