small fixes for login
bootstrap
Merge branch 'master' of https://github.com/profuel/showdown_wblog

Conflicts:
	apps/blog/views.py
	external/base_views.py
corrections