Ship Dev Iteration 4/29

Merging changes made in dev since 4/29 to QA.