before i can merge // khadim
Merge branch 'master' of https://github.com/alakhame/remi
well
Conflicts:
	Symfony/app/logs/dev.log
	Symfony/src/Innovit/UserBundle/Entity/User.php
questions // khadim
Merge branch 'master' of https://github.com/alakhame/remi logs conflict
(merge)

Conflicts:
	Symfony/app/logs/dev.log
	Symfony/src/Innovit/ProfilBundle/Controller/ProfilController.php
	Symfony/src/Innovit/UserBundle/Entity/User.php
correction bugs LOAD // khadim
Merge branch 'master' of https://github.com/alakhame/remi yes

Conflicts:
	Symfony/app/cache/dev/appDevDebugProjectContainer.php
	Symfony/app/cache/dev/appDevDebugProjectContainer.php.meta
	Symfony/app/cache/dev/appDevDebugProjectContainer.xml
	Symfony/app/cache/dev/appDevUrlGenerator.php
	Symfony/app/cache/dev/appDevUrlGenerator.php.meta
	Symfony/app/cache/dev/appDevUrlMatcher.php
	Symfony/app/cache/dev/appDevUrlMatcher.php.meta
	Symfony/app/cache/dev/templates.php
	Symfony/app/cache/dev/twig/09/e3/35b2ed953451bc1977bf91af3088b1c03347ce61162a94df5ac57b7e9f7a.php
	Symfony/app/cache/dev/twig/0c/92/5b68a8aeac83371b04f80e4397e24b7e1e6f8765042ca9751dc66b29b845.php
	Symfony/app/cache/dev/twig/11/1f/72e2e8682856b03c9663064f7df95779f2ee29aff7f56de169cd31537be8.php
	Symfony/app/cache/dev/twig/11/5d/35b2074185a04047cc01103f0a3d423701263a8fb683429eaebbcc3ed50f.php
	Symfony/app/cache/dev/twig/13/38/163188c22b3bb126f883a71edffe39f1d9ef04ddd5a3026c31d4d91a4094.php
	Symfony/app/cache/dev/twig/13/9d/dc5a3f46b6a725b60c5094bbcfb69c7358d55b81e39d7ed598032722e15b.php
	Symfony/app/cache/dev/twig/14/6d/c1e96fea0c9d20d99cc9912abbd6722a7149c3de168251140ca686ca949a.php
	Symfony/app/cache/dev/twig/15/ce/5233d45cca24a8aa860bc52fc39a97909dce2d54ae4958ebd96763543485.php
	Symfony/app/cache/dev/twig/17/58/f21b522d6917b37e66758b331890195a5bfdb1e2a59644f9eb089477de61.php
	Symfony/app/cache/dev/twig/18/71/94a6c98b5a176e6fed3bf953ea5512a401021f431eaa0b6c02297288acaa.php
	Symfony/app/cache/dev/twig/1a/8b/ae1bff25c0a8afc8b05b9da0224fc7f2b196a69f2e5d6639500a23932ada.php
	Symfony/app/cache/dev/twig/24/b5/579ca561317e8be3ccfc69ec983c62805947d8fd881ef9ed95b2b9b6cdb5.php
	Symfony/app/cache/dev/twig/25/27/bad3af338eff5b2bfbc9b118be454aeb7db029c2c9fed0e8b001d707dd82.php
	Symfony/app/cache/dev/twig/2a/04/b200fb68d308446a8af0d7f616e0e06beaedcf84796980040b9042d8629c.php
	Symfony/app/cache/dev/twig/2b/b4/5b5f87cf426f42ddf827fa1fa2d3302c977fc7bd2b60ddc2ee92b7604b4d.php
	Symfony/app/cache/dev/twig/30/10/f0f55a352fb200f463d1fd16a6ac47870548c5b07486bee400acdc50e083.php
	Symfony/app/cache/dev/twig/31/fb/98ffa4c1a93d0e0bddea280f69b7e261ad84a5debfbc5c574a0b9ae30321.php
	Symfony/app/cache/dev/twig/33/c8/fbbea07d86178b581e6627068f1888913444243e21bdfb0a0894c98f4b4f.php
	Symfony/app/cache/dev/twig/36/a7/4df96371b96da7188753ab33a1c76c479ca76717d19f8680f6f19af9da4b.php
	Symfony/app/cache/dev/twig/38/2e/fd6e82b1ee7601f1d1434808a8e480182d2123d7f8bba4766f87e23a3579.php
	Symfony/app/cache/dev/twig/39/61/26e4ab46e483ac091d9b6bf2fc1185ab405c090291646a1e14bc5bfd0246.php
	Symfony/app/cache/dev/twig/40/09/c8679cbb0740fa884b980035e92e7466b14c291290381e92ff95261abbe5.php
	Symfony/app/cache/dev/twig/40/33/55920d688001bdd8f2feea82b9a8f5770b53f10e406d006051b498927133.php
	Symfony/app/cache/dev/twig/40/9a/5ce8e6689c7a45a08b687242cbf29394f5306801caffa587bb8e946cf626.php
	Symfony/app/cache/dev/twig/42/61/92664d2460e94c87677c4eecc14c34d267062b3ec11f6a2f6897397ddd77.php
	Symfony/app/cache/dev/twig/45/37/627d2e5c4438373239d5a0d3b113d0e2634cf24289b15ecce1de1331c445.php
	Symfony/app/cache/dev/twig/49/45/c8de443804dc95c7d4c3902e47f3c62e09c76059bb1ba654762fad12388c.php
	Symfony/app/cache/dev/twig/52/5a/75ee7d97a46ecfd9a7251461cb85649315031fcb018642e8b0ece0645e67.php
	Symfony/app/cache/dev/twig/53/9a/71d8919e1cc9d1bfbc425c667b357daa7cd0b6c76bb3b51b69d5af3547e6.php
	Symfony/app/cache/dev/twig/54/2c/a4b1e9ae5b869156e95539f9e01730db8e3946c376deacaee19619633d4f.php
	Symfony/app/cache/dev/twig/56/b2/115470819e0e2f8ccb066a336e6d7abac99c746f44be413bce6faa2e16f9.php
	Symfony/app/cache/dev/twig/56/be/bcae9018292bb80ca2fe087db147b514485e1373f89518e00d2b2b2e0573.php
	Symfony/app/cache/dev/twig/57/27/ec9ec40454026f068bc42b404df8b7dc009941b6022aaebe12867af968c9.php
	Symfony/app/cache/dev/twig/59/53/9362b18ee1f7ffcd637e42bc7e1690e6135ec10a5a21f1d2d916fe7aef3e.php
	Symfony/app/cache/dev/twig/5a/b8/68751c90e106f60a2c3e0fc037b69c8d90f30382e0076843c047bdaaa52f.php
	Symfony/app/cache/dev/twig/5c/2c/dd07aafdfb94fc36d18db095fd8e94a75751fbe46a0f04c95060ef32e460.php
	Symfony/app/cache/dev/twig/5f/d3/ab53a2cb37bd45f6fa8e86b61eeba5372092332ef77b3f7f618ee462ede4.php
	Symfony/app/cache/dev/twig/60/7f/ddaad9b1e724d7c0be6bc54b48b89b5f7d351632e5303895e01a56d32514.php
	Symfony/app/cache/dev/twig/60/9d/b189a54bf28e1c7e6c413e3b4dc7afe790d8e29bcad6c0de8e85c4af9a01.php
	Symfony/app/cache/dev/twig/64/0a/7273c3a24cb99308b3b7289db54f2e0433cdf0c935a59f974d5276734a32.php
	Symfony/app/cache/dev/twig/64/4f/798cacb0f6832e3821b9038848bfbfe98e62b66cb74c676095bff40678c8.php
	Symfony/app/cache/dev/twig/67/3d/769210cd91127712ded5275c7d06323af914511682fafc53be20dcd66aee.php
	Symfony/app/cache/dev/twig/67/a5/51c80f92dc22e664b474b2cff1f19d10db858b8ea37154f5683294243f20.php
	Symfony/app/cache/dev/twig/69/7f/2e75df84dd961f2dd621543e7fd5d8e4e3ea0c5a3849a688dbd75fdcb12a.php
	Symfony/app/cache/dev/twig/6c/a0/ff515ce099c49e40edb62c186803d61c1231c3aa894fb64600216caa3f81.php
	Symfony/app/cache/dev/twig/6c/b8/7b0a42862ce68f264a265d5ab72d556fa3eefd25ca9f244570b650a75dce.php
	Symfony/app/cache/dev/twig/74/76/4f574f59e349ec8e97a1f8f670a8603b412353161c088ecafddc6d74a186.php
	Symfony/app/cache/dev/twig/79/62/1f9280d3287bce506461a72979fe2dbde2fc5d2302a283b7c8608dbd886e.php
	Symfony/app/cache/dev/twig/7c/fe/b7ece471f0ba21633b8eed7bf708161150653adb82760096c39f74d7f09d.php
	Symfony/app/cache/dev/twig/7e/d3/30e71f5103fd116ce5f4764e75e2d1b27cfa21c5d4be06b314fb5eed9229.php
	Symfony/app/cache/dev/twig/81/23/bdfffd6aeeab86e24acba8308abb3db487034845ef878816ff9f43bcc183.php
	Symfony/app/cache/dev/twig/85/39/1592957fcbe745356b60f788e4ee29a990be7b27247494fc5aeae1afba95.php
	Symfony/app/cache/dev/twig/86/69/76df6cd6acb849d8db9c76eb5172f47d6b49e95f254599ea9f69e58516c5.php
	Symfony/app/cache/dev/twig/89/09/8b5d075c42a2912f7f14d9ba0d2a39d97139f700fc5f95b7469c251b049e.php
	Symfony/app/cache/dev/twig/8e/48/419b281bb01a80c8797a7c616d34459aa4747ce0a6dc1502f2741498afde.php
	Symfony/app/cache/dev/twig/8e/68/326431eb77e58650e6b269165d105683ba2222ae7b4e9878bf9d30daa0b4.php
	Symfony/app/cache/dev/twig/8f/54/ae10298bc39c5ffae696ca2d214c9265a533ebde6899d0304825dfe40d36.php
	Symfony/app/cache/dev/twig/8f/f2/bc2e35f47b76b26b3341941782f6cfe7a57735765950135c11364bace211.php
	Symfony/app/cache/dev/twig/91/61/aebc17c0ab89d8ddb1e4d10af14d4bb3b3be1409a3f09bbf63d67e744fe6.php
	Symfony/app/cache/dev/twig/93/5e/2c0cc7427fdbead1f013b00adda3fd19b0a0f093570914a037fb879ff59b.php
	Symfony/app/cache/dev/twig/95/aa/7ff32d15c1b670698694a9f1809a15b46102acf8fa6b0309a204e0a9509d.php
	Symfony/app/cache/dev/twig/98/37/35e55a6e224ca390461df435e66b09ea591922b9e2db3acc9b93229a01ed.php
	Symfony/app/cache/dev/twig/9d/43/b9121dbc32b84af0ff794d7186452a78c0090c5f89942ed03db3882ac67d.php
	Symfony/app/cache/dev/twig/9e/ec/b97b29f0d2f57d0c61d3e821c9d267e79449311923d8419829092ba5dbac.php
	Symfony/app/cache/dev/twig/a2/11/3adbbebf4c8d3adb7d918419011a780a4e8eef26f39282d8bf04572b3984.php
	Symfony/app/cache/dev/twig/a4/e9/bcb011adf3ba6f69ab2f31e97b9e5f79ed738b5aaec8b2636ec3da6fd0b5.php
	Symfony/app/cache/dev/twig/a5/ac/097fb690d9dc6a12e4139d3bd357abfd2cf3f6f59a85bff19a99d92fa3a4.php
	Symfony/app/cache/dev/twig/a9/fb/705af7efecaae5d5dcfce894483ca6434eb6f487c525d486f0f739d5e5f1.php
	Symfony/app/cache/dev/twig/aa/79/66a4841f7823bb6d48a0d133080574fe910e2c538f85d708f3e731226d08.php
	Symfony/app/cache/dev/twig/aa/d9/b3b037fe5688eeea219e3b999fcea0409bfb9daf0be2901a9ff91d873d44.php
	Symfony/app/cache/dev/twig/b3/0c/d60d325b081de8d75b2d1af29f5ff688c255c674dd91775fd5e3697f1344.php
	Symfony/app/cache/dev/twig/b3/13/05ffc390054c318e351336931ec7af1e24ae4581c1a98c58792455e4fd9c.php
	Symfony/app/cache/dev/twig/b3/9a/25e0604740aa012c2a418d5f3061c71f5f8d5a9ab75d2e4b255eda447663.php
	Symfony/app/cache/dev/twig/b3/9d/80bced32eb37b96290621e88d3989e0dd2f733da74d01a22180db35b9e2d.php
	Symfony/app/cache/dev/twig/b5/47/974c27a06b9923004c393e24d4c0189deb17a4fbe02060f2b7d77051d489.php
	Symfony/app/cache/dev/twig/b6/d7/285e9184ca55a50eb3d712c0667868d6d226273cc72b2df6733a8a280ccb.php
	Symfony/app/cache/dev/twig/b7/0b/eeac69569b2ab12f5c8bf7e59440892fc05f1d08b6654cb640c935d4253b.php
	Symfony/app/cache/dev/twig/b9/68/fba3243fc0273ee395ad89fbad7011258a7336b49da7ddabde2baf3f5bc8.php
	Symfony/app/cache/dev/twig/be/f3/a1391a3e61b5149140d49bad4793790f44f6d6503bf70822908de83c80e3.php
	Symfony/app/cache/dev/twig/c1/63/90644e6b8b258cd4120f78fc0ce8c456e61ef07a9596ba9ed875672cb118.php
	Symfony/app/cache/dev/twig/c1/78/a9e1f1af61fff78d7b1b1ad5ff3a497a64c44b7240896be6c1019df44bc3.php
	Symfony/app/cache/dev/twig/c2/3a/f3c6f64996f44f4df9d73a29ed4f3cf5885e853e0585f9fdb0c2e1d2bfff.php
	Symfony/app/cache/dev/twig/ca/06/3d2373b3b854b6cae63babf5d5cf195c8b784b9723ebf2fbdb66152bd5cc.php
	Symfony/app/cache/dev/twig/cb/f2/5f03e906f9e6b8d9c64ca5384a0fb6b9d05e647738ff947c613e92e2f79b.php
	Symfony/app/cache/dev/twig/d9/81/71f25e5ffd3ee58d86c79fa59ad8987a21e6618c060f0aceab2944f3f283.php
	Symfony/app/cache/dev/twig/dd/1a/0b91ed19668cfbb7afeb5c1e240ecfbdbb075934adf45c860fea3d6e5179.php
	Symfony/app/cache/dev/twig/e3/75/ea7179320095b891336c9b702740842c1ed7fd87bb055be070ad3076926f.php
	Symfony/app/cache/dev/twig/e3/c5/36509693ee80350e6441bf84310f5d459325554fd9492da1f0274341fcaf.php
	Symfony/app/cache/dev/twig/e4/d8/9c1f4598465ff8844045e33f252ae5fab1493930bb9a1baef3c46981649f.php
	Symfony/app/cache/dev/twig/ea/bf/0fae04a0b6ec980b83e4aa1c6f43948f2c2ae2c50fcdbde4701fe6dae5b1.php
	Symfony/app/cache/dev/twig/ec/59/f9ae02314cf076e93e35a4244160a8e5229a8812f35f244cd1c356884c5b.php
	Symfony/app/cache/dev/twig/f0/c7/e29d429839668a6ef8d6df6cc2f191fe8649568eeac0a3b3f789622c8ed2.php
	Symfony/app/cache/dev/twig/f2/53/9e21b3b1c588417de65cf4782d8b1f55bd04a43600b09889319dbb63374a.php
	Symfony/app/cache/dev/twig/f3/bd/bf86aaf5ba3d82cf9b42357402fb4b30e67438cf9c337f4988fc48e14c12.php
	Symfony/app/cache/dev/twig/fe/58/70b27f0008e4ea180cd56f61e47379551f2af95bbd010e813a47cdce58bd.php
	Symfony/app/logs/dev.log
	Symfony/src/Innovit/ProfilBundle/Resources/views/profil/test.html.twig
	Symfony/web/scripts/script_test.js