Added PHPUnit
Merge branch 'dev'