add merge
add class abstractBomp
Merge branch 'dev'