Merge branch 'develop' into master
Updated composer to support symfony 2.2.*