merge
Merge branch 'master' of https://github.com/hjmu/incu
fix simplified chinese and calendar picture bug