_
little stuff
lesson and test xml definiton
xml is now wellformed and valid
:-)
just a litte tinkering
Schriftart + ein paar Feinheiten
no concret changes
Merge remote-tracking branch 'origin/GameDev' into oath

Conflicts:
	src/main/java/de/hofuniversity/iws/client/PhysixLab.java
	src/main/java/de/hofuniversity/iws/client/widgets/LoginPage.java
	src/main/java/de/hofuniversity/iws/client/widgets/UserHome/HomeThemenwahl.java
	src/main/java/de/hofuniversity/iws/server/services/UserFriendServiceImpl.java
	src/main/java/de/hofuniversity/iws/shared/services/UserFriendService.java
	src/main/resources/de/hofuniversity/iws/PhysixLab.gwt.xml
keine anpassung und build nach merge
:-)

:-)
little bug fix
Neujahrs kommit
gamefactorys, little bugfixes+optimisations+cleanup
Merge branch 'oauth2' of github.com:LearnPhysics/WebApp-PhysixLab into oauth2

Conflicts:
	src/main/java/de/hofuniversity/iws/client/widgets/Thema/Lektionswahl.java
	src/main/java/de/hofuniversity/iws/server/XMLReaderParser.java
	src/main/java/de/hofuniversity/iws/server/services/LessonServiceImpl.java
	src/main/java/de/hofuniversity/iws/shared/dto/LektionDTO.java
	src/main/webapp/Subjects/kinetic/lessons/pendulum/lesson.xml
Merge branch 'GameDev'
Merge branch 'Session-Managment'

Conflicts:
	src/main/java/de/hofuniversity/iws/client/widgets/LoginPage.java
	src/main/java/de/hofuniversity/iws/client/widgets/LoginPage.ui.xml
	src/main/java/de/hofuniversity/iws/server/oauth/Providers.java
Merge remote-tracking branch 'github/Presentation'

Conflicts:
	src/main/java/de/hofuniversity/iws/client/widgets/LoginPage.ui.xml
	src/main/java/de/hofuniversity/iws/client/widgets/UserHome/UserHome.java
fix for game factory service larvice loader