Добавлено редактирование данных
Merge remote-tracking branch 'origin/master'

Conflicts:
	FormGenerator.Client/FormGenerator.Client.csproj
	FormGenerator.Client/Scripts/app/controller/main/MainForm.js
	FormGenerator.ServerBusinessLogic/FormGenerator.ServerBusinessLogic.csproj
	FormGenerator.ServerDataAccess/FormGenerator.ServerDataAccess.csproj