jdk is on level 1.5.
javadoc warnings
some prefs
javadoc
Merge branch 'master' into test

Conflicts:
	regal-api/src/main/java/de/nrw/hbz/regal/api/Article.java
	regal-api/src/main/java/de/nrw/hbz/regal/api/FileResource.java
new test file
javadoc, license, formatting
Merge pull request #83 from jschnasse/test

javadoc, warnings, licenses
Merge pull request #84 from edoweb/test

javadoc, warnings, licenses, formatting