Merge branch 'master' of github.com:paulocheque/python-tornado-bootstrap

Conflicts:
	templates/base.html