symfony 2.2 updates
symfony 2.2 updates
Merge branch 'master' of github.com:prohfesor/chocolate

Conflicts:
	composer.lock
Merge branch 'master' of github.com:prohfesor/chocolate

Conflicts:
	composer.lock