Connecting Services
Merge branch 'master' of https://github.com/MySmallfish/SAMS

Conflicts:
	src/Portal/Controllers/Api/Competitions/CompetitionTypesController.cs