LoginFilter
Merge branch 'master' of github.com:Korvin32/work

Conflicts:
	project-2/WebContent/WEB-INF/web.xml
	project-2/WebContent/admin.xhtml