actualizar
Merge remote-tracking branch 'origin/master'

Conflicts:
	Floristeria/admin/Model/FlowerModel.php
	Floristeria/admin/flowers.php
	Floristeria/nbproject/private/private.xml
Merge remote-tracking branch 'origin/master'