20141010_office
Merge remote-tracking branch 'origin/master'

Conflicts:
	db.sqlite3
	labs/settings.pyc
	labs/urls.pyc
	templates/common/register.html
	tweeter/forms.pyc
	tweeter/views.pyc