implemented with Guice
added resource filter factory
some improvements
Merge branch 'master' into guice

Conflicts:
	pom.xml
small fix