add javadocs
Merge remote-tracking branch 'upstream/develop' into javadoc

Conflicts:
	src/test/java/de/dhbw/humbuch/viewmodel/BaseTest.java
Merge pull request #615 from davherrmann/javadoc

add javadocs