remove encoding hack
support deployment to gae
update war package