travis develop icon
merge strategy ours for travis
Merge remote-tracking branch 'origin/master' into develop
travis develop configuration
travis - composer - github
fix PHPUnitTask requires PHPUnit to be installed when phpunit is installed as a requirement by composer
add to README how to proceed with git config merge.ours.driver true
#1146 refactor function that load composer autoload
ignore php 5.2 travis errors because php 5.2 don't execute composer
fix branch name in README.md
Merge remote-tracking branch 'origin/develop'