Fixed import file
Merge branch 'master' of https://github.com/aploss/zo2
Fixed some files and update xml file