merge config.properties
Merge branch 'master' of https://github.com/Hive2Hive/PeerBox.git

Conflicts:
	peerbox/config.properties