debug
Merge branch 'Develop' of https://github.com/Kaiymu/RyS into Develop

Conflicts:
	Assets/Scenes/test.unity
	RyS.userprefs