Merge branch 'jr/bugfixes' into 'master'

Fixed encoding problem that caused Maven not to build the project

For some reason, the "-" symbol in the Javadoc headers caused problems when building the project with Maven, called from a script. This might have been caused by someone editing the file with the wrong file encoding setting.

The respective branch can be deleted once merged.

See merge request !4