Update readme
Merge branch 'develop'
update phpunit conf file