Updates from ShareLaTeX
Merge remote-tracking branch 'origin/sharelatex-2014-10-17-1353'

Conflicts:
	main.tex