Squashed 'applications/marello-application/' changes from 3a5a0ae..ce…

…35880

ce35880 Merge pull request #11 from clicktrend/patch-1
89c1f39 Update routing.yml
cd74db3 Merge branch 'bugfix/MAR10001-712-add-taxcode-remove-suppliers' into maintenance/2.1
fe3d83d Merge commit '73de19e5ff6867b2fb523997401df9d818e84235' into bugfix/GH-PR9-update-ororequirements
fd1a7eb - remove lock files
942b01e - remove lock files from master
08ed5eb - Release preparation 2.1
fcbd86d Merge commit 'ce6c5c85565cf4ba66d2942b1c1aa34c3c389a33' into release/2.1
d79c4f4 Merge commit '7139917230723d97b9b8c99e27dcd5c3f7d2e8e1' into release/2.1
680e701 - updated version number in upgrade notes
61d89c6 - prepared composer.json files for release
8033763 - Updated dev.json and lock files to include `self.version` as internal pointer to packages of marello, marello-ee and subscriptions
9552e48 - updated dev.lock files
98eb6c0 - updated dev json and lock file to include oro 3.1.9 - small changes regarding docker environment files
4c72f7d - CS fixes - Fixed CreateProduct test in ProductController test to take the attribute family into account when creating new products
d3ed4d0 - Merge commit '22a02abd2e26d568767c7824dba7970017871107' into feature/MAR10001-499
7139917 - fixing issue of calling undefined method in the EntitySerializer
ce6c5c8 Merge branch 'brainOut-patch-1' into dist-master
c464be3 - updated phpDoc return value of WFAStrategyInterface to enforce contract
f7c8208 make Interface contract respected
17383a0 - added composer.lock to .gitignore - remove composer.lock files
4ecfc51 - added composer.lock - added dev.lock - updated branch alias in marello package composer.json
05e1647 Add 'applications/marello-application-ee/' from commit 'd13f2b41e079dff4eee99f8874928459658daaff'
a56511d Merge commit '44448293702551e588fff6fd5860d9d1e0db4a11' as 'package/marello'
d13f2b4 - added marello as source - added formatting-code and language to install
e53127b - Update application structure for 3.1.x OroPlatform
cf3c44f - updated dependencies for Marello

git-subtree-dir: applications/marello-application
git-subtree-split: ce35880

config/routing.yml

@@ -2,7 +2,7 @@
 # 3rd party routes
 #
 _liip_imagine:
-    resource: "@LiipImagineBundle/Resources/config/routing.xml"
+    resource: "@LiipImagineBundle/Resources/config/routing.yaml"
 
 #
 # ORO routes