Updated dependency on Stash bundle
Updated Symfony to 2.2.3
Merge branch 'master' into merge_from_sf_standard

Conflicts:
	composer.json
	composer.lock