Fixed issue #25 and issue #35 - expectations can be defined in different scopes
Corrected descriptions of specs2 specifications
specs2-support: created deprecated MockFactory trait for backward compatibility
docs: Updated documentation related to MockFactory traits
Fixed issue #72. Errors that cause ScalaTest test case failure are not hidden anymore
Merge pull request #77 from pawel-wiejacha/master

ScalaMock-3.1.4
Updated Scala and ScalaMock versions in README.md
Updated Scala and ScalaMock versions in README.md
Merge pull request #78 from pawel-wiejacha/sm_3.1.4

Updated Scala and ScalaMock versions in README.md
Widen MockFactoryBase.ExpectationException to Throwable

This lower bound is too restrictive, it prevents for instance the use of AssertionError (if you want to integration with JUnit).
Merge pull request #80 from backuitist/patch-1

Widen MockFactoryBase.ExpectationException to Throwable
docs: fixed a typo
Merge remote-tracking branch 'origin/master' into issue_25_fix_squash
Merge branch 'master' of https://github.com/paulbutcher/ScalaMock
Merge remote-tracking branch 'origin/master' into issue_25_fix_squash

Conflicts:
	core/src/main/scala/org/scalamock/MockFactoryBase.scala
Merge pull request #71 from pawel-wiejacha/issue_25_fix_squash

Fixed issue #25 and issue #35 - expectations can be defined in different scopes
Merge branch 'master' of https://github.com/paulbutcher/ScalaMock
Merge remote-tracking branch 'origin/master' into issue_72_fix
Merge pull request #81 from pawel-wiejacha/issue_72_fix

Issue #72 fix
Merge branch 'master' of https://github.com/paulbutcher/ScalaMock