Manual Merge 12/13/2014

Update donator and such