branches \!
branches \!\!
Merge branch 'experimental' of https://github.com/ada86/geo-kadoh into experimental

Conflicts:
	lib/configManager.js
added tmp log
revive keys instead of regenerating
Merge branch 'master' of https://github.com/ada86/geo-kadoh into experimental

Conflicts:
	lib/configManager.js
Merge branch 'experimental' of https://github.com/ada86/geo-kadoh into experimental

Conflicts:
	lib/configManager.js
override put to give peerArray
Merge branches 'master' and 'experimental'

Conflicts:
	lib/checkIn.js