Merge origin/master

Conflicts:
	app/views/producto/index.php
Merge origin/master
Merge origin/master

Conflicts:
	app/views/producto/index.php
Merge origin/master