merge
Merge branch 'devbli' of https://github.com/timestep/adMan into devbli