add some improvements
add merge method for Phalcon\Config
update condition
Fix acl memory adapter path is used for tests
Fix invalid callback PhalconTest\Acl\Adapter\Memory::_allowordeny, cannot access private method PhalconTest\Acl\Adapter\Memory::_allowOrDeny()
add ini config adaptor
update other adaptors
add ini php config file
update PHDOC
add base functionality for firephp logger
add some improvement
add firephp logger
fix some possible bugs
add ini php config fileadd ini php config file
add firephp logger tests
fix typo
add ini php config fileadd ini php config file
annotationsDir option can't be set

Test on the type of options is wrong
Updated method Phalcon\Mvc\Model::_postSave and save
Fix #2954 - serialize with columnMap

Fixes https://github.com/phalcon/cphalcon/issues/2954 according to @dreamsxin work.
Fix fatal error on rendering empty asset collection

The `_collection` property in `Phalcon\Assets\Manager` is null by default, and
implicitly becomes an array when `Phalcon\Assets\Manager::add` is called. This
causes a fatal error when for example `outputJs()` or `outputCss()` is called
without adding resources, which is a normal use case.

    Fatal error: Uncaught exception 'Exception' with message 'The argument is not initialized or iterable()' in phalcon/assets/manager.zep:693
Merge pull request #2975 from brainformatik/2.0.0

[2.0.0] Fix broken ACL inheritance
Merge pull request #2996 from dugwood/patch-2

Fix #2954 - serialize with columnMap