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

Conflicts:
	src/Portal/Controllers/AttachmentsController.cs
	src/Simple.Sams.Contracts/Model/Competitions/WinnerOptions.cs
	src/Simple.Sams.Contracts/Model/StartTimeType.cs