Added Refeds R&S category
Fixed build problem with overwriting config
Minor updates
Merge remote-tracking branch 'origin/master' into develop