commit
Merge branch 'master' into fine

Conflicts:
	Unity/ProjectSettings/EditorBuildSettings.asset
Merge pull request #84 from moyoron64/fine

commit