Same changes as intended in previous commit (i forgot to 'git add' the files):
  - fixed compile errors (commented out incomplete conflict-handling code)
  - changed namespace from 'CONFIGURATION' to 'ConfigSystem'
  - replaced olod read and store methods in ConfigManager.h to use the new methods readparam and storeparam
  - added a makefile for the ConfigSystem project