Added User and UserMap Bean
Merge branch 'master' of https://github.com/MrHaribo/IntTe-Miniprojekt

Conflicts:
	WebContent/WEB-INF/faces-config.xml