new lib dama
Merge branch 'feature/lib' into develop
new config
fix bug in dama
new www reg
fix bug in dama
Merge branch 'feature/www' into develop