Upstream 28 04 2014

- Refactoring to support bidder interface(documentation forthcoming)
- Fix a build ordering issue in the router