Conflicts:
	README.md
	project/Build.scala
	src/main/scala/com/v_standard/scalikejdbc/orm/query/QueryColumn.scala