Summer 2014 Updates into Dream Project

Merge updates from Summer 2014 into UWDP branch of DreamSIS