Final version, hopefully
Merge branch 'develop'

Conflicts:
	abstract.tex
Should not have used --amend