Added search
migrations for search update
updated params
updated params
google webmaster tools
infite scrolling

infinite scroll tweaks
composer fix
composer.lock
Merge branch 'master' into articles

* master:
  composer.lock
  composer fix
  infite scrolling
  google webmaster tools
  updated params
  updated params
  migrations for search update
  Added search

Conflicts:
	app/AppKernel.php
	composer.json