Fixes #406
Fixes #405
Merge pull request #407 from delving/issue406

Fixes #406 & #405
Fixes #408: Multiple dictionary mappings to the same node needed special naming
Merge pull request #409 from delving/issue408

Fixes #408: Multiple dictionary mappings to the same node needed special...
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