Merge branch 'formatter'

Conflicts:
	.gitmodules
	DAVKit.xcodeproj/project.pbxproj