1
Merge branch 'master' of https://github.com/refox1/scc

Conflicts:
	client/sc.xcodeproj/project.pbxproj