merge error fixed
add ics2amqp's control file
use unit test assert method in unit tests
Merge branch 'develop' of github.com:capensis/canopsis into develop
improve: metric search in perfstore webservice
fix: rollback to old engine filter
use right assert methods
add: mock module in canolibs ; add: unittest for cauth.cas ; fix: unittest of cdowntime cfile and cselector
Merge branch 'develop' into auth-cas