Part of: https://github.com/imeji-community/imeji/issues/639
Merge branch 'develop' of https://github.com/imeji-community/imeji into develop

Conflicts:
	src/test/java/storage/StorageTest.java