Add config version control
Merge branch 'master' of https://github.com/BitMobile/core
Merge branch 'master' into develop