merge
Merge branch '2.0.0' of github.com:phalcon/cphalcon into 2.0.0
merge
Conflicts:
	phalcon/mvc/collection.zep
zephir generate fixs [ci skip]