Adding new params to dist
Merge branch 'lord_baine' into develop
LegacyBundle entities
Merge branch 'zjoia_master' into develop

Conflicts:
	app/config/parameters.yml.dist
Merge branch 'develop' into lord_baine
Unit tests for LegacyBundle
Merge branch 'zjoia' into develop