Fixing SHORTITLE mistake
Merge branch 'master' into ms

Conflicts:
	reference.pdf