ScalaMock-3.1.4
Merge pull request #77 from pawel-wiejacha/master

ScalaMock-3.1.4
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
Merge remote-tracking branch 'origin/master' into issue_25_fix_squash