Updates from ShareLaTeX
Merge branch 'sharelatex-2014-12-03-0720'

Conflicts:
	main.tex