Updated readme:s
Added whelk.config.uri property to loadConfiguration in build.gradle
Removed mock_whelks.json
Removed mock-whelk uri from gradle tasks
Moved whelks.json into etc/environment/prod
Merge branch 'master' of github.com:libris/librisxl

Conflicts:
	build.gradle
	etc/mock_whelks.json