modificado: src/Cacic/CommonBundle/Controller/ComputadorController.php
	modificado: src/Cacic/CommonBundle/Entity/ComputadorRepository.php
	modificado: src/Cacic/CommonBundle/Entity/LocalRepository.php
	modificado: src/Cacic/CommonBundle/Entity/RedeRepository.php
	modificado: src/Cacic/CommonBundle/Entity/SoRepository.php
	modificado: src/Cacic/CommonBundle/Resources/config/routing.yml
	modificado: src/Cacic/RelatorioBundle/Resources/views/Faturamento/faturamento.html.twig
	src/Cacic/CommonBundle/Controller/SGConfController.php
	src/Cacic/CommonBundle/Resources/views/Sgconf/
	src/Cacic/WSBundle/Resources/views/Sgconf/
Merge branch 'master' of https://github.com/lightbase/cacic

Conflicts:
	src/Cacic/WSBundle/Controller/MapaController.php