Коммит на всякий случай
Merge remote-tracking branch 'origin/master'

Conflicts:
	FormGenerator.Client/FormGenerator.Client.csproj
	FormGenerator.Client/Scripts/app/utils/CommonUtils.js
	FormGenerator.ServerBusinessLogic/FormGenerator.ServerBusinessLogic.csproj