Thesis author
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/theses_controller.rb
	app/views/theses/_form.html.haml
	app/views/theses/index.html.haml
	app/views/theses/show.html.haml