merge with SF wiki and calimero-ng.pdf