Original
Original
Original
Merge remote-tracking branch 'origin/master'

Conflicts:
	is2/settings.py
	is2/urls.py
	templates/base.html
Crear Usuario
Delete dataSources.ids
Delete scope_settings.xml
Delete .name
Delete dataSources.xml
Delete encodings.xml
Delete is2.iml
Delete misc.xml
Delete modules.xml
Delete vcs.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	is2/settings.py
	is2/urls.py
	zar/models.py
	zar/views.py
Modificar Usuario
Merge remote-tracking branch 'origin/zalimben0'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/is2.iml
	administrarUsuarios/forms.py
	administrarUsuarios/views.py
	autenticacion/views.py
	is2/settings.py
	is2/urls.py
	templates/usuario/createuser.html
	zar/models.py
Delete dataSources.ids
Delete dataSources.xml
Delete is2.iml