borrando archivos
Merge branch 'master' of https://github.com/vmonsalve/sysAdmin

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/templates.php
	app/cache/dev/twig/02/73/d37b192ff72108297c9c95aa95f966c066a46f16cd565c38afbb61615446.php
	app/cache/dev/twig/02/ac/69e970dc9c000fde32677fb6b127f590c5f32eae4d0c5828c29d0aa0403d.php
	app/cache/dev/twig/03/a9/66dcc520bce31b1200adcfcac2b03419e8642bda0df08621120d667ecbed.php
	app/cache/dev/twig/03/da/439fcb363336a3ac9179f35cc778d1bf5e29e27cdad7d48531fd11325505.php
	app/cache/dev/twig/06/90/e279ff47ab70b3d2cb183b84c9d92dda23b1b66ff873c38b3363b6da58b9.php
	app/cache/dev/twig/09/38/5c4132990b31ad3103caf4949aa793d5dd69166499d31669e5fb3c0934dc.php
	app/cache/dev/twig/0a/60/591cc9c65b0d76fcb2c89ef44fabc795ba89bd82fcf5f254aa8081a1a302.php
	app/cache/dev/twig/10/07/442b2a9e0f52fa11626444f087587a0800397dda8b4fc5565c9ce1237cba.php
	app/cache/dev/twig/10/84/5589fd43b1cd656f75b5029c56e11f4eea89e54bfa4b83d8cb716c7f9981.php
	app/cache/dev/twig/12/bc/5dd198947ffcb9e2ef42c6c4de9880077a1902de341d9dd27c94f263a6d4.php
	app/cache/dev/twig/16/0d/94f0cfa4095a001c8369f5871277805de597bf51edea2f6bfa55b1c6fb89.php
	app/cache/dev/twig/19/f3/378cf2fdef4442bd6cd92979c24eefaa1a975be0cffc891f0d8ab11ce5ca.php
	app/cache/dev/twig/1d/4d/b982ada4037aab87cf0d02245df690c506c932e535abcb17e9fd10a42a61.php
	app/cache/dev/twig/1d/c7/9f23e688edb4b1f0b07b4e5056363fa01c9d47b88d0b26c075d372a34a80.php
	app/cache/dev/twig/2b/71/926a1cd82d43c4bca8a9062147dcda9c196cbb3013f27da055c4b4ab7a43.php
	app/cache/dev/twig/2c/3f/531f9009f735911ed8cddc562d11c584d0f28f41127443d4bb8dfb1132ef.php
	app/cache/dev/twig/2f/7b/03f77222d94cbbb9388f159e175d8d7e0fea06df411cc122609c466ece44.php
	app/cache/dev/twig/39/7d/3f02a824f1caf0f7e54abba74ed50c0da19af2716e4c911be300499e9d8b.php
	app/cache/dev/twig/3f/9e/90ea92f32d00772064247843066199c5b50b9b456fb7e7878aba81cb4c18.php
	app/cache/dev/twig/42/ad/1293a8a84ea3de5557a29556328c70cbaadced17004c0b65b3294eb0234a.php
	app/cache/dev/twig/44/15/c4fc23fff9bc2af06c014334b8002a4a5a8e72daaad177331f3fe238ba8a.php
	app/cache/dev/twig/45/25/3065ce2b94ffb171edd6b3c87418a89576500a7f753ae6f27eb8c6c3260b.php
	app/cache/dev/twig/47/e3/75b18c58d7c1137cba41fcb48a959ee1985f4964b61b23831f309d791114.php
	app/cache/dev/twig/51/c2/e44e3e9ed0ff55c1f648923fa5903ae3186aa5e3e7e80ab4dcd52e95f8d8.php
	app/cache/dev/twig/53/e1/9edda144167ebd765c58ee1b99b78b4a911df052b7d91ddee3cfb78837c7.php
	app/cache/dev/twig/54/80/65c0aa6a3bde06576cbaf563d0a2a3ec9df474dee0dce9128d6743f1b306.php
	app/cache/dev/twig/5a/99/c7a6b47d17a0614832e026fbed9c4526e96f16833dd9dfa362a158d6f759.php
	app/cache/dev/twig/60/a6/516d148be98397c5896aed03587a677bced18582b90574103b607dd68b7b.php
	app/cache/dev/twig/67/cf/43379310497d4954d7784322121a193afc9aa8b44434cc77da3a3fe9470b.php
	app/cache/dev/twig/6a/de/b97b7a8c961a6a020392050f7e3505c07ba5769ee06a77980fd1d20ba59b.php
	app/cache/dev/twig/6d/c0/ff85ddff8269492142d58731cadf35d5237c16f8e68d470c453c9f832c9d.php
	app/cache/dev/twig/6d/da/9832de9f984e7ac0e2674ab17eee00bbc938789dbe142fcfde9ad1fafe92.php
	app/cache/dev/twig/6f/c1/14ed73290a67c5df28f5a62839f3d2bb1f83dff3049f866bd1d95f25b1df.php
	app/cache/dev/twig/77/49/83fe7bd157d86721811ddbf35783dbb4b36e1efab9255da8e8383a586399.php
	app/cache/dev/twig/7b/2d/4ea5a9e522d932bde60c9e6c25a62e63655f7ab3d5a2c3fe846bdc88576c.php
	app/cache/dev/twig/7d/eb/24d09fc15c1a25b9d2fe3c56750b62f685184d2cd763e5bb9e6ed1d52518.php
	app/cache/dev/twig/7e/03/38187cf5cb2cb5f183315643c350a9ac8624c8248b9196b8e3997d6d485e.php
	app/cache/dev/twig/7f/54/9105c345cdddd2d3cd5ccdae127518b4705591906b2a3815d8d778f185e3.php
	app/cache/dev/twig/86/52/ca7258b5de6c66ebaaaa54c160e499ada9f5fadd4403611a82be748e7584.php
	app/cache/dev/twig/89/73/59fc5a6b61efc5d39753578599410ebd391a499a0fd155d8d4ae622b1c44.php
	app/cache/dev/twig/8b/fe/e593947a8a5b33177be4db9008405b5fa943d7b1453f996a305b405e418f.php
	app/cache/dev/twig/8c/17/71d190d83f467f41a4774d2ba9a741094d5631957e822d469c547255991f.php
	app/cache/dev/twig/8c/a7/4a1bb14f1b50a7199053641b5e15cbcace86fac3e4ee545da2bddb24269a.php
	app/cache/dev/twig/90/92/f241fce87c6a56f4785ce508bbbad3aca573623975cf32ac0a22a744ddfb.php
	app/cache/dev/twig/91/61/78a27269ce81717e22e9df8a8785e6f9c4b091b826e2751e394c28f9d07e.php
	app/cache/dev/twig/97/f1/fce594845e6bd5c4824f3c24c89b5fdf5db408e9afcf0fb323c30f54c3cb.php
	app/cache/dev/twig/99/bf/3ec2a4e2285937c476bd1046598138e8eaf1431b84e3fca5daa756d8f52c.php
	app/cache/dev/twig/9f/00/b850945549df4be790e55d6583d48f6986cefe764a0dfbdb1026636d19c0.php
	app/cache/dev/twig/ad/71/63d38057799aaef0cd32f6301f0f957e3c14986593e0c2dfaa5087e1c0df.php
	app/cache/dev/twig/c1/15/5597a6ca2b1dceb1b20f6eb7be7b490852c0790fe5457988253efc6c3211.php
	app/cache/dev/twig/c5/46/95c7379f9187b45be1e9fce21b8f9588b9f9a28c3cf1cea640df06b043cb.php
	app/cache/dev/twig/c5/bf/26775f042c62d74e25d3c53415278ab11010273f860d5b3cf0db346eb1dc.php
	app/cache/dev/twig/ca/68/bf077b2036d3d65a9d1d1465bb49be9a5fd08ae5c896ea1f5804ac7e770d.php
	app/cache/dev/twig/cc/40/edee7316e8e647baca3c4df64429c23b3721f6645f470a860f8c87772f45.php
	app/cache/dev/twig/ce/71/195d3db3dceb39179d271a512ec764d265d7a4d65cf957b4aaaf765bc47a.php
	app/cache/dev/twig/cf/0c/d1d6906b095f85c2fc6da293c28dcf3aea10a3fff91c6c3c97fd3f74ad76.php
	app/cache/dev/twig/e1/43/a7bb9f5ae4088437e2bf0e1a3d4938b8a9d69ef274206d523d0fe27a2e3b.php
	app/cache/dev/twig/e2/56/3f4d1a9de786d456683391a92f0ac6352b478e14d2420f6d4f8a55df15a7.php
	app/cache/dev/twig/e6/b3/7081f7bc0947cff72a708b344632746d5ef9bb5f8c8d98568cdc6b2d432d.php
	app/cache/dev/twig/ea/1d/41824528196c3e929277c496a0995dadb75cb7952c88619a0437ba844ed2.php
	app/cache/dev/twig/f7/fa/3de08faa9a2a2219087b259a049e370e869ca3abe8e496a8d6f6da200e79.php
	app/cache/dev/twig/fa/96/8a99255a620673431ee5de2f46e48965bd6c5ed7c5bd40f668408bb5bfa6.php
	app/cache/dev/twig/fb/25/a018dc84c9139793b2dadf85a6a9cb5d670e7e06c3a8a4c7e5324dc86d9e.php
Crud producto hay un detalle en editar que no entiendo no deja guardar nombre porque no encuentra el metodo setNombre siendo que esta funcional y no esta cargando bien los formularios editar de categoria muestra pantalla negra