Merge branch 'master' of gitlab.solas.uni.me:solas-match
Merge branch 'develop'
Merge branch 'develop'
Corrected function name.
Fixed redirect for login
Fixed another redirect for login