Commit
Merge branch 'master' of https://github.com/RedVida/RedVida

Conflicts:
	index.php
	protected/models/Donantes.php
	protected/runtime/application.log
	themes/semantic/views/layouts/main.php