Moved configuration files to Core
Merge remote-tracking branch 'upstream/master'
Few more nCrunch tweaks