Cambio sobre ale

Cambio sobre ale
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/hello.php