Add heroku configuration
Use error_log handler, use sylius params
Set database port
Set pdo_pgsql as driver in parameters.yml.dist
Make assetic:dump on compile
Fix JSON syntax
Add ext-imagick
Add ext-imagick
Rebuild
Merge branch 'master' of git://github.com/Sylius/Sylius

Conflicts:
	app/config/config.yml
	composer.json
	composer.lock