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

Conflicts:
	Rakefile
	TODO.mkd
	apps/app/handlers.py
	apps/app/models.py
	apps/app/tests/test_models.py
	settings.py
	templates/app/main.html
	templates/base.html