Added new method for adding isbn as generic identifier.
Better json object handling in marc2json conversion.
Merge branch 'master' of github.com:/libris/librisxl

Conflicts:
	whelk-core/src/main/resources/logback.xml