Marc/Ash: [sample 1.1.x] Port to Slick 2.0.0-RC1, test passing