Adjusted scaladoc in GenFactories.scala.
Adjusted scaladoc in Matcher.scala.
Completed scaladoc in Collecting.scala.
Resolving conflict.

Conflicts:
	src/main/scala/org/scalatest/enablers/Collecting.scala