Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Delete composer.lock
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Adding LegacyBundle and related DB/EM
installed guzzle client
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fixing config.yml
Refixing config.yml
Merge branch 'develop' into lord_baine

Conflicts:
	app/AppKernel.php
	app/config/config.yml
Merge branch 'develop'
Merge branch 'master' of https://github.com/zjoia/orchid-clasia
Removing APC
Merge branch 'develop'