Trip Bundle generation
Merge branch 'master' into articles

* master:
  migrations
Articles
sensio generator 2.2
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
various, cleanup, update, ...
travel bundle generation
generated Travel bundle
fix