Started to fix the issue #125 from github, preliminarily commit
Merge branch 'develop' into feature/125-cookie-login
Merge branch 'feature/125-cookie-login' into develop