New content
Pertichenko-style previous commit fix
Again :(
Merge remote-tracking branch 'origin/master' into new-design

Conflicts:
	content/contacts.md
	content/faculty/faculty_dean.md
	templates/widgets/twitter_widget.html