Nightly Build 8/28/14

-add can1 & can2