small changes
add active state
Merge branch 'master' of https://github.com/aokman/Erya3D

Conflicts:
	Engine/Scene/SceneNode.cpp