:grin:
fixing merge confict
update travis branch
Merge branch 'devel'

* devel:
  :grin:
removing phpunit.log