Merge branch 'develop' of github.com:bigbag/term-flask into develop