latest
Merge branch 'master' of github.com:stevedekorte/BitmessageKit

Conflicts:
	BitmessageKit/BitMessage/Server/BMServerProcess.m
	BitmessageKit/BitMessage/Server/BMTorProcess.m