sync
Merge branch 'master' of github.com:slayoo/advoocat
sync
Merge branch 'master' of github.com:slayoo/advoocat

Conflicts:
	tests/bombel/test_bombel.cpp
Merge branch 'master' of github.com:slayoo/advoocat
not working bombel