Css and js minify configuration (commented out, as it would try to minify on every request on development. It is assetic bug, hopefully will be fixed soon)
Merge remote-tracking branch 'origin/master'