Merge branch 'bugfix-1.0.2'
Merge branch 'release-1.1'
Update config of phpunit
Merge branch 'hotfix-1.1.1'
fixed php warning when trying to find placeholder for importing resources in array instead of string
Merge branch 'skip-arrays-when-importing-resources' of https://github.com/marci/phalcon-config-loader into marci-skip-arrays-when-importing-resources
Merge branch 'marci-skip-arrays-when-importing-resources' into develop