Merge branch 'develop' of https://github.com/pastorsx/AdvantEDGE into develop