Слияние с нервом
Updated: git index and fixed line ends
Added: .gitignore
Merge origin/master into diabloStageEdit

Conflicts:
	client/presentation/propertiesEditor/View.js
	core/widget/Widget.js
Scope для widget