Important configuration settings completed
Merge branch 'master' of https://github.com/ToonLupin/Wosh

Conflicts:
	Wosh/Wosh.logic/Project.cs