muchas cosillas molonas
Merge branch 'TakaraHunterAlf'

Conflicts:
	principal/views.py

cambios