Merge branch 'bugfix-1.0.2'
Merge branch 'release-1.1'
Update config of phpunit
fixed php warning when trying to find placeholder for importing resources in array instead of string