Cambio menor.
Cambio menor.
cambio menor.
Merge remote-tracking branch 'origin/iteration-1' into iteration-1

Conflicts:
	SGC/SGC/settings.pyc