Merge branch 'master' into opt-lookup

Conflicts:
	sip-core/src/main/java/eu/delving/metadata/CodeGenerator.java
	sip-core/src/main/java/eu/delving/metadata/OptBox.java
	sip-core/src/main/java/eu/delving/metadata/StringUtil.java