modified:   public/images/example.drawIndicator.png
Merge branch 'master' of https://github.com/santymoreira/sgc

Conflicts:
	public/images/example.drawIndicator.png

	modified:   app/views/mapasbalanced/AumentarSatis.blade.php
	modified:   app/views/mapasbalanced/FortaCapDoc.blade.php
	modified:   app/views/mapasbalanced/FortaInterApre.blade.php
	modified:   app/views/mapasbalanced/ImpleSgc.blade.php
	modified:   app/views/mapasbalanced/ImplenGestionProc.blade.php
	modified:   app/views/mapasbalanced/MejorarClimaLab.blade.php
	modified:   app/views/mapasbalanced/OptimiRecu.blade.php
	modified:   app/views/mapasbalanced/PotenInnov.blade.php
	modified:   app/views/mapasbalanced/PotenInves.blade.php
	modified:   app/views/mapasbalanced/PotenVincSociedad.blade.php
	deleted:    public.zip
	deleted:    public/public1.zip
	deleted:    public/public2.zip
	deleted:    sgc.zip