.
Merge branch 'master' of https://github.com/sueraphael/paper

Conflicts:
	3dv-2014authorkit/latex/egpaper_final.synctex.gz