relacion
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo_project/demo_app/AdminItem/views.py
	demo_project/demo_app/templates/base.html
	demo_project/urls.py
relacion