Merge on 11/29/2014

Merge with newest code