SCREEN-144 添加编码
Merge branch 'master' of git@github.com:chocotan/loli.io.git

Conflicts:
	pom.xml