co
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	ninja-core-demo/src/main/java/conf/Module.java
	ninja-core-test/src/main/java/ninja/utils/NinjaTestServer.java
	ninja-core/src/main/java/ninja/NinjaServletDispatcher.java
filter to servlet change
filter to servlet change
Merge branch 'develop' of https://github.com/zoza/ninja.git into develop
DemoServletFilter adjustments
java generic warnings
Merge pull request #81 from zoza/develop

Filter to Servlet changed