Merge branch 'master' of https://github.com/woodrufs/Collabrified-Text-Editor

Conflicts:
	WeWrite/WeWrite.xcodeproj/project.pbxproj
deleted