login and logout working
Merge branch 'master' of github.com:paulovillani/camprulho

Conflicts:
	base/templates/base.html