Keep login session unless refresh
Merge conflict
Merge branch 'develop' of https://github.com/chonla/geekytodo into develop