Merge Winter 2014 updates into uwdp-develop

Merges updates developed throughout Winter 2014 into the Dream Project development branch.