updating master branch

Updating master branch of uct2015 code with the producers and configurations that went into the L1 emulator.
Can you check here also?