.
Merge branch 'master' of github.com:Mediotype/EcomDev_PHPUnit