Accept changes 4/10/14

Changes as of 0950
Changes
Sync 4/16/14
Sync part two 4/16/14