better rewrite filter
Merge branch 'master' of github.com:mikooo/tsoha

Conflicts:
	WebContent/WEB-INF/web.xml