rien
Merge branch 'master' of https://github.com/Tiger76/BibliSymfony

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/classes.php.meta
	app/cache/dev/profiler/2b/6f/be6f2b
	app/cache/dev/profiler/index.csv
	app/cache/dev/twig/02/11/4b691df2937b8f0381edd899c9d00829d64febfdd453f2fbc4f4f7fa4674.php
	app/cache/dev/twig/1e/93/0e7dd1d3e73e3525bf0ed2c32c3a9e65ccc963de4da4ae6222e7ab117ac6.php
	app/cache/dev/twig/49/b1/3e6069e9d3561d809d03027b36484947a6940f3b97e0298c1c6c23e6f42a.php
	app/logs/dev.log
creation des entity
Merge branch 'master' of https://github.com/Tiger76/BibliSymfony

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/assetic/routing.yml
	app/cache/dev/classes.php.meta
	app/cache/dev/profiler/index.csv
	app/cache/dev/twig/00/ad/c3b278931b2aa7ce7d8de6ef87642fe2be1754fec03340ce1b9b39c911b5.php
	app/cache/dev/twig/02/11/4b691df2937b8f0381edd899c9d00829d64febfdd453f2fbc4f4f7fa4674.php
	app/cache/dev/twig/0b/0c/28daff4dbafa66037ed4c8958d3b97c868ff0fe100161ad11b0b1fb04c2f.php
	app/cache/dev/twig/0e/ed/5194d47d65cb1a63d9f4a4dc7751938b0f67d11884f8d65c0f8c642fa012.php
	app/cache/dev/twig/18/fc/7b0817e182dec88dc389a95e6e2111d7d68e7e7d2751e362a4f5d0e391f7.php
	app/cache/dev/twig/1e/93/0e7dd1d3e73e3525bf0ed2c32c3a9e65ccc963de4da4ae6222e7ab117ac6.php
	app/cache/dev/twig/22/15/c53587e443b53f7c9e34d9838b1df81782fec301072bb00d6bb3e8cd9197.php
	app/cache/dev/twig/29/72/149d63724267ebfd921943518802003ce3b15813c7136cc7bddf640a4fcd.php
	app/cache/dev/twig/2a/c2/6955ed71819082f92e8a4ceb3d3266e9509024ba36d19993e438fc025876.php
	app/cache/dev/twig/2c/02/445e7f7ebec8f502e52bb747a95f8ed70aac61085a8a6e56809d65059200.php
	app/cache/dev/twig/2f/91/40e72f27263aaedffa44c08603508eedd4ee842b46985d5042120dd76917.php
	app/cache/dev/twig/32/f9/e8639badc6ca23dd3dc2d657580eb5b5a28063e25429b8b0c4b2bff3ee34.php
	app/cache/dev/twig/37/b4/ab1afb37010df620f2d3f2fd4ab47aaf42802ffc77ac2c1a240b684ca28f.php
	app/cache/dev/twig/38/a9/fb22d299c13f0e10a6212f55c8277f9373b5f75000bffe549e9085df328b.php
	app/cache/dev/twig/39/68/23f20e8dbe4ce7facc5f3a3df65742f14e4da68945d01a3274a34c0fd082.php
	app/cache/dev/twig/42/49/7015dd8e5256e85b1d5f448fecd58e86c57fc3e2af1085fade00189a09e3.php
	app/cache/dev/twig/44/d7/d0bba9ddeec853b46f44c8752fdf2b5e5cab2035254f0885585144f1336a.php
	app/cache/dev/twig/45/ab/acfdaf14fa024eb715717a8d307fe79a60cc0551b26db7ec40e3a1a29e4d.php
	app/cache/dev/twig/47/56/3c287fd9dba33941272910182baf145da6f4c22ad110cbfd5297dc17fcc1.php
	app/cache/dev/twig/49/48/8f7e4254c705da09ef9b0725783c862e3d8644b84c001e3466ba7c943cd9.php
	app/cache/dev/twig/49/b1/3e6069e9d3561d809d03027b36484947a6940f3b97e0298c1c6c23e6f42a.php
	app/cache/dev/twig/4b/92/bdcb914dcc8e93f18800b91c83f015b436e8f6322cd3122882a0b6bf598c.php
	app/cache/dev/twig/50/a1/b3bc551072c57686e6bbc32edb02efe6fe3cd46c0f5b122edffac092338c.php
	app/cache/dev/twig/5a/97/a97a7063473fe8614022dc2a6c13353a4a8895dd0768f84928d6cb674a5e.php
	app/cache/dev/twig/5b/3d/62b072fdbbe21bdeeb452761b329b31fcda751cfcfd06c620884dd6e9b4f.php
	app/cache/dev/twig/5d/fb/147714b286bfab581cd3761af9e3a1e2b4503466b2b8fa3108f70776939e.php
	app/cache/dev/twig/68/70/3fc96a9960afb4cddb11bb4c469c2edcfbbc0e19c0b390cc2d3b15408da0.php
	app/cache/dev/twig/70/49/6a1df49d0e219239f5e63e58fa93313362393274e51cc5261263cc4e10fd.php
	app/cache/dev/twig/71/47/e1159fe21162e3cd1896dbc4e596d3a07cb5d87488cd872c58dd4c54dbe3.php
	app/cache/dev/twig/73/14/0d45dabe8d513280e1d6b0f1622d53aace837f5e777d665b6ba31aa6de5d.php
	app/cache/dev/twig/78/ac/2303e9942e30ff7cb3cda9c4feb5d6977326cde94b15dfd3843fc673c84b.php
	app/cache/dev/twig/7b/8b/f7343dc524c19becff5ff46394ba8d3b809f22c8c3161325e1ac21f960bc.php
	app/cache/dev/twig/7e/76/3ee734ff1117cbd86864df9152e52645e102a88b5881f529d6782aa23a5b.php
	app/cache/dev/twig/80/ba/b66ae81308fb0f588cae05b16e41ddff8de68185aec12533e610b940f201.php
	app/cache/dev/twig/83/7f/61b1b3942a9878ee9d78d32e7dbf51603e84c7fac9fd3d56fef028241c33.php
	app/cache/dev/twig/8a/1b/6fdc8bffcf7c2b5574a91e8d79d528b53cf82005d4228a66691b46713812.php
	app/cache/dev/twig/8b/04/f479d5b08bb684ecca545f9a9fcf9ccf357a15984b6507574eb447e68c33.php
	app/cache/dev/twig/8e/7b/acfe92786489bf8c10162658d2b1239b284dd302ed0079f4a45904b5bb4d.php
	app/cache/dev/twig/92/04/20a02081c9e43afcce8641989ddffabfc028e7b0e199fc4f31021f6efaf6.php
	app/cache/dev/twig/95/9d/e7c3268bfaf19ece69e6639a2af3670a7683e050ff490a67c0aae4c6e0db.php
	app/cache/dev/twig/97/d4/c9496e0f8071bdbdd87864da3331219388adc9609743ff0be74265f88f60.php
	app/cache/dev/twig/99/11/614ab51b062a41087b7e2bed8101e7bdf7f6ae05322d7359632014cfa1d6.php
	app/cache/dev/twig/9a/82/3f9bc728622b8a51ee1adfb71f5709ac4062ab440fbf8b6b70a42c9ec6c5.php
	app/cache/dev/twig/a0/c1/b63ed55cfbdb95a9aabe95385b2ca6ae89327cb4778caef0cc979ed2deff.php
	app/cache/dev/twig/a2/ae/a37797ed8786ec961ad49a05a5edcbe1ad1f2c2c4b4ae01d56bda3cda4f7.php
	app/cache/dev/twig/a5/16/616276d69d6ceeb941a4ec6428663e4ced139dae1b1869e59cf0ef001b3d.php
	app/cache/dev/twig/a6/21/355bde34baa908db77d6cf0151c5ba27b0dd8ca94b75388c2a508724dec3.php
	app/cache/dev/twig/b5/f8/2318dc26b10df51d186da499aed3f80cdfcc54ed54e848d616a1feb4a22f.php
	app/cache/dev/twig/b6/52/908ddd56e46fa3beef433e503ea37e7d350553fac5a7f30492172b90a668.php
	app/cache/dev/twig/ba/46/53cdd0742196a49ad2702495d805b9a09bc9b5bbefd69bb7b575f4a655d2.php
	app/cache/dev/twig/bd/71/1bd58e90a913f8c48a2afca11f6d730e05c7c91f7cc34dfd65e005f17165.php
	app/cache/dev/twig/bf/c2/cc55c14ec646de2b647c724329ad510596389d129f3c65816e348f12805a.php
	app/cache/dev/twig/c1/2f/8ea4b2869503440c21d5a3232321b7d2cfc9180a33655fe3a6eacf7ce3e3.php
	app/cache/dev/twig/c8/52/c943e36360085c6bbe7bd459c8c3ff990688fbac5b2af7b5144ea0bea247.php
	app/cache/dev/twig/ca/86/d21bed1b5b15ddef88297e9b380bddaac61473ccf6d315c64cade95eb381.php
	app/cache/dev/twig/d2/c7/a45f1a337760fc0324cdf1929a6afca89bbae3f3cc22a1c20168521b09a0.php
	app/cache/dev/twig/d9/18/e68e52f52e91b30d0079b991a4a4d53ff18858987f3218aecc145d13ac28.php
	app/cache/dev/twig/dc/fd/a1e35bbd08966caaf680ac7c523b0d6359ec803ad775c133663100786657.php
	app/cache/dev/twig/e4/13/eadb85b7be64db0c1ac8029b13bfa002766300356e869c2a9ee9497c957b.php
	app/cache/dev/twig/e4/9d/0ae8b50b8f9f726427794db7354b4f35ebbe5fa850d2f16f559a1725c2bf.php
	app/cache/dev/twig/e6/65/c716056447d7ee49bf98c25808f454545beac8e1820245b5f27dca567f2e.php
	app/cache/dev/twig/e6/75/6fb7737f4fa8e538d70a2124f58d6f92069338ab94db4243750e76e96288.php
	app/cache/dev/twig/ef/fb/7e42b0d81bb2681eeeb547f0c1524f38747d8c66b79ed0f1c3e8e7f9e64e.php
	app/cache/dev/twig/f8/a1/a2be742b59424e9a2b06e65c51ae9bb9f8fe27630886f3f6ce275604ebc1.php
	app/cache/dev/twig/f9/96/f22324575ce83c69837beb63ec8babf7d5233d3f500c53809af72f7e08fb.php
	app/cache/dev/twig/fd/22/6e33de8f5b0612d6021ddf63d44611593f7e9a0c6558946a399ae8f34cd1.php
	app/cache/prod/annotations/597877fc1359850fa8786ead82dcc8f6f491d628#showAction.cache.php
	app/cache/prod/annotations/597877fc1359850fa8786ead82dcc8f6f491d628.cache.php
	app/logs/dev.log