Synced with latest tfs build `2917.20131218` changeset `1937`
Tracking additional file
Merge branch 'master' of https://github.com/NikolayIT/OpenJudgeSystem

Conflicts:
	Open Judge System/Web/OJS.Web/App_GlobalResources/Global.Designer.cs
	Open Judge System/Web/OJS.Web/App_GlobalResources/Global.resx
	Open Judge System/Web/OJS.Web/Areas/Contests/Views/Compete/Register.cshtml