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
docs: fixed a typo
Merge remote-tracking branch 'origin/master' into issue_25_fix_squash
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