Merge pull request #198 from datacratic/upstream_07_07_2014

Upstream 07 07 2014
Merge branch 'master' into bidder_interface_events