cosas varias
Merge remote-tracking branch 'origin/master'

Conflicts:
	model/_Customer.php
	view/profile.tpl