Conflicts:
	README.md

New: JsonMapper in Data Structure and Storage section.

Add missing I18n section.

Conflicts:
	README.md

Conflicts:
	README.md

Conflicts:
	README.md

Conflicts:
	README.md

https://github.com/netresearch/jsonmapper

Added Cilex a micro framework for creating PHP CLI

Added Prophecy

Add Sphinx query library.

Prophecy is a highly opinionated yet very powerful and flexible PHP object mocking framework. 

It's used as mocking framework in [PHPSpec](https://github.com/phpspec/phpspec) and will eventually be supported by [PHPUnit](https://github.com/sebastianbergmann/phpunit) (see: 6c21c66567/).

Added Cilex a micro framework for creating PHP CLI to the Command Line Section

Added Cilex a lightweight framework for creating PHP CLI scripts inspired by Silex.

added list of IDEs

Adds PHPTAL as templating library.

Add print_o

Added PHPCheckstyle

Add CssToInlineStyles to Email section

Update README.md

Update deprecated repo

DEPRECATION NOTICE by author (vlucas)
==================
WORK ON THIS PROJECT HAS STOPPED. Please use Spot v2 instead - it is actively maintained, and is based on a more solid foundation in the Doctrine DBAL (database abstraction layer, not Doctrine ORM), and had much wider and mroe robust database support (MySQL, SQLite, PostgreSQL, SQLServer, Oracle, etc.).

Add Zxcvbn-php

Updated Propel's description.