Merge branch 'master' into 2.2
Merge branch '2.2' of https://github.com/freekh/play-slick into 2.2
0.5.0.3
Merge branch '2.2' of github.com:freekh/play-slick into 2.2
minor change: fixed name of project
WIP: new DDL plugin
fixed samples and code (NOTE: DDL Plugin still not operational)
Merge branch 'slick20-wip' into slick20

Conflicts:
	build.sbt