Conflicts:
	README.md
	project/Build.scala
	tool/src/main/resources/templates/db/entities/Entity.scala.tmpl