change list_products button "Ver detalles"
change category_list in home view
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/logs/log-2014-12-09.php