Merge branch 'release/1.0.6' into develop
updated admin
updated to version 1.0.7
Merge branch 'release/1.0.7'