Add sample.devise.rb
Remove broken shipment manifest
Merge branch 'staging'