wip on bombel
Merge github.com:slayoo/advoocat

Conflicts:
	tests/bombel/test_bombel.cpp