fix screen 1 in issue #652, fix issue #714
Merge branch 'merge-gui-master' of https://github.com/imeji-community/imeji into merge-gui-master