More Fixes
Merge branch 'master' of https://github.com/ninedotdesign/Arth

Conflicts:
	Arthrosurface.xcodeproj/project.pbxproj
	Arthrosurface/SalesDocuments/.DS_Store