no message
Merge commit 'd2a98f9a4ae1098d095aecea8f93e86435f9fe4d' into slick2.0-support

Conflicts:
	macros/src/main/scala/slickmacros/annotations/ModelMacro.scala
Slick 2.0 support