filter to servlet change
Merge branch 'develop' of https://github.com/zoza/ninja.git into develop