Renamed file and user permissions were added
user permissions were added
Merge branch 'master' of github.com:gabomarin/venta_web

Conflicts:
	Codigo/Controller/InventarioCtl.php
File renamed