Merge branch 'feature/enable-login' into develop
Merge branch 'develop' of https://github.com/itmat/collos into develop