set encoding and remove two findbugs warnings
Merge origin/master
remove some findbugs wanrings and set xls export encoding to win cp