test, fixing jx
Merge branch 'master' of https://github.com/finkfast/CollabrifyIOS

Conflicts:
	WeWrite.xcodeproj/project.pbxproj