umstrukturierung der anwendung
umstrukturierung
umstrukturierung
websicht-basis

websicht hinzugefügt
nouvelle classe pour le challenge
registration implementiert
Revert "nouvelle classe pour le challenge"

This reverts commit d5fbbb50966e792a69f08ab0b035bbcfb69332db.

Conflicts:
	ChallengeMe/challengeme-core/target/challengeme-core-0.0.1-SNAPSHOT.jar
	ChallengeMe/challengeme-core/target/classes/com/challengeme/dao/UserDao.class
	ChallengeMe/challengeme-core/target/classes/com/challengeme/register/Registrieren.class
	ChallengeMe/challengeme-core/target/maven-archiver/pom.properties
	ChallengeMe/challengeme-web/src/main/java/com/tank/challengeme/ServiceLocator.java
	ChallengeMe/challengeme-web/target/challengeme.war
	ChallengeMe/challengeme-web/target/challengeme/WEB-INF/classes/com/tank/challengeme/ServiceLocator.class
	ChallengeMe/challengeme-web/target/challengeme/WEB-INF/classes/com/tank/challengeme/UserController.class
	ChallengeMe/challengeme-web/target/challengeme/WEB-INF/lib/challengeme-core-0.0.1-SNAPSHOT.jar
	ChallengeMe/challengeme-web/target/classes/com/tank/challengeme/ServiceLocator.class
	ChallengeMe/challengeme-web/target/classes/com/tank/challengeme/UserController.class
	ChallengeMe/challengeme-web/target/maven-archiver/pom.properties
usersicht

usersicht
Merge pull request #1 from mtaaly/master

pull taaly master