Merge branches 'develop' and 'feature/style' of https://github.com/tagbangers/wallride into develop