first backup of adx-dev on yama
Merge branch 'master' of https://github.com/richarit/ADX-dev