Work in progress
so naja gelöst
abgabe commit
last merge for abgabe
first test commit, gwt test not working
first test
wip
DBHandler Tests
Dependency Injection working
changed licsense header & author tags
some tests
merge Handler Tests + little refactoring
submodul fix
Merge branch 'unit-tests' of github.com:LearnPhysics/WebApp-PhysixLab into unit-tests
changed Darwinsbox dependency, changed Ginjitsu to own fork with bugfix
forgot to delet darwinsbox submodul
Merge branch 'unit-tests'

Conflicts:
	Web/src/main/java/de/hofuniversity/iws/client/HistoryPageController.java
	Web/src/main/java/de/hofuniversity/iws/client/PhysixLab.java
	Web/src/main/java/de/hofuniversity/iws/client/PhysixLabModul.java
	Web/src/main/java/de/hofuniversity/iws/client/jsonbeans/LessonJson.java
	Web/src/main/java/de/hofuniversity/iws/client/jsonbeans/TestJson.java
	Web/src/main/java/de/hofuniversity/iws/client/playn/PhysicGameBox.java
	Web/src/main/java/de/hofuniversity/iws/client/playn/StandardPhysicGame.java
	Web/src/main/java/de/hofuniversity/iws/client/playn/entitys/Ball.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/Header.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/Lektion/Lektion.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/Lektion/Test.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/LoginPage.ui.xml
	Web/src/main/java/de/hofuniversity/iws/client/widgets/SubWidgets/Breadcrumb.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/SubWidgets/OnlyLogout.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/SubWidgets/OnlyLogout.ui.xml
	Web/src/main/java/de/hofuniversity/iws/client/widgets/SubWidgets/ProfileBig.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/SubWidgets/ProfileBig.ui.xml
	Web/src/main/java/de/hofuniversity/iws/client/widgets/SubWidgets/UserHomeFriend.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/Thema/Thema.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/UserHome/HomeFreunde.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/UserHome/HomeProfile.java
	Web/src/main/java/de/hofuniversity/iws/client/widgets/UserHome/UserHome.java
	Web/src/main/java/de/hofuniversity/iws/server/data/entities/GameDBO.java
	Web/src/main/java/de/hofuniversity/iws/server/data/entities/GameResultDBO.java
	Web/src/main/java/de/hofuniversity/iws/server/data/entities/GenericEntity.java
	Web/src/main/java/de/hofuniversity/iws/server/data/entities/LessonDBO.java
	Web/src/main/java/de/hofuniversity/iws/server/data/entities/LessonProgressDBO.java
	Web/src/main/java/de/hofuniversity/iws/server/data/entities/NetworkAccountDBO.java
	Web/src/main/java/de/hofuniversity/iws/server/data/entities/SubjectAreaDBO.java
	Web/src/main/java/de/hofuniversity/iws/server/data/entities/UserDBO.java
	Web/src/main/java/de/hofuniversity/iws/server/data/handler/GameHandler.java
	Web/src/main/java/de/hofuniversity/iws/server/data/handler/LessonHandler.java
	Web/src/main/java/de/hofuniversity/iws/server/data/tests/ProviderDateTest.java
	Web/src/main/java/de/hofuniversity/iws/server/data/tests/Test.java
	Web/src/main/java/de/hofuniversity/iws/server/oauth/OAuthCallbackServlet.java
	Web/src/main/java/de/hofuniversity/iws/server/oauth/Providers.java
	Web/src/main/java/de/hofuniversity/iws/server/oauth/accessors/FacebookUserData.java
	Web/src/main/java/de/hofuniversity/iws/server/oauth/accessors/GoogleUserData.java
	Web/src/main/java/de/hofuniversity/iws/server/services/LessonServiceImpl.java
	Web/src/main/java/de/hofuniversity/iws/server/services/LoginServiceImpl.java
	Web/src/main/java/de/hofuniversity/iws/server/services/UserServiceImpl.java
	Web/src/main/java/de/hofuniversity/iws/shared/CollectionUtils.java
	Web/src/main/java/de/hofuniversity/iws/shared/KeyValue.java
	Web/src/main/java/de/hofuniversity/iws/shared/dto/LessonPreview.java
	Web/src/main/java/de/hofuniversity/iws/shared/dto/User.java
	Web/src/main/java/de/hofuniversity/iws/shared/services/UserService.java
	Web/src/main/java/de/hofuniversity/iws/shared/services/Utilities.java
	Web/src/main/resources/META-INF/oauth.properties
	Web/src/main/resources/META-INF/persistence.xml
	Web/src/main/webapp/Subjects/kinetic.json
	Web/src/test/resources/de/hofuniversity/iws/PhysixLabJUnit.gwt.xml