fixes
Merge branch 'master' of https://github.com/stargazerwna/wind

Conflicts:
	templates/basic/includes/pages/node_editor/node_editor.tpl