Merge Winter 2014 updates into uwdp-deploy

Merge Winter 2014 updates to be deployed to expo