adding setting view
Merge branch 'master' of https://github.com/weapon3042/Feng

Conflicts:
	OpenSilo.xcodeproj/project.pbxproj