merge
Merge branch 'master' of github.com:Voluntarynet/BitmessageKit

Conflicts:
	BitmessageKit.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:Voluntarynet/BitmessageKit