kjkjk
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/semantic/views/donantes/_form.php
Merge branch 'master' of https://github.com/RedVida/RedVida