рефакторинг
Merge branch 'master' into dev

Conflicts:
	node/models/TypeModeProperty.js
Merge pull request #16 from tehfreak/dev

рефакторинг