Merge branch 'develop' of https://github.com/ever-co/ever into develop