update lock file
move to PSR-4, woohoo
symfony 2.4 support with RequestStack
Merge branch 'psr-4'

* psr-4:
  move to PSR-4, woohoo

Conflicts:
	composer.lock