fixed merge problem
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop