Merge branch 'master' of https://github.com/SneakyBobito/phalcon-stubs

Conflicts:
	README.md