logueo backend
correccion cirujeada banners js
Merge branch 'diego' of http://github.com/diegoduncan21/Neatics into paulo

Conflicts:
users/views.py

modified:   .gitignore
deleted:    base.db
modified:   portal/templates/base.html
modified:   users/views.py
Merge branch 'menuBanners' of http://github.com/diegoduncan21/Neatics into paulo
signup
Merge branch 'diego' of http://github.com/diegoduncan21/Neatics into paulo

Conflicts:
	base.db

Changes to be committed:
modified:   portal/templates/base.html
modified:   users/urls.py
modified:   users/views.py