Merge branch 'testing/slick20' of /home/git/lab_repos/safespeed/play-slick
Merge branch 'master' of http://git.safespeedllc.com:9001/safespeed/play-slick into testing/slick20
removed implicit param