Fixed ERRAI-462: @Inject doesn't work in servlets when Errai's CDIServletStateListener is in use
Fixed demo deployment in Tomcat (fallout from the weld-servlet dependency change)
Merge branch 'master' into 3.0
Removed old&unnecessary fork of the Weld ServletListener (refs ERRAI-462)