Merge branch 'master' of https://github.com/ManaOrb/FSceneManager

Conflicts:
	README.md