merge
Merge branch 'master' of github.com:jackorlando99/guggli-projekt

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebContent/WEB-INF/web.xml
	src/struts.xml
added dbmanager and login interceptor