Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
	src/settings.h

diff --cc src/http_command.c
Simple merge

diff --cc src/pazpar2_config.c
Simple merge

diff --cc src/settings.c
Simple merge

diff --cc src/settings.h
index 39823f0,5826ac6..a746dfa
--- 1/src/settings.h
--- 2/src/settings.h
+++ b/src/settings.h
@@@ -62,10 -65,17 +65,16 @@@ struct settin
      struct setting *next;
  };
  
+ struct settings
+ {
+     // Array of pointer setting, index is looked up in setting_dictionary
+     struct setting **settings;
+     int num_settings;
+ };
+ 
 -void settings_read_file(struct conf_service *service, const char *path,
 -                        int pass);
 -void settings_read_node(struct conf_service *service, xmlNode *n,
 -                        int pass);
 +int settings_read_file(struct conf_service *service, const char *path,
 +                       int pass);
- int settings_read_node(struct conf_service *service, xmlNode *n,
-                        int pass);
++int settings_read_node(struct conf_service *service, xmlNode *n, int pass);
  int settings_num(struct conf_service *service);
  int settings_create_offset(struct conf_service *service, const char *name);
  int settings_lookup_offset(struct conf_service *service, const char *name);