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

Conflicts:
	3dv-2014authorkit/latex/egpaper_final.synctex.gz
.
.
.
.
Merge branch 'master' of https://github.com/sueraphael/paper

Conflicts:
	3dv-2014authorkit/latex/egpaper_final.brf
	3dv-2014authorkit/latex/egpaper_final.synctex.gz
	3dv-2014authorkit/latex/egpaper_for_review.aux
	3dv-2014authorkit/latex/egpaper_for_review.log
	3dv-2014authorkit/latex/egpaper_for_review.synctex.gz
	3dv-2014authorkit/latex/images/Presentation1.pptx
	3dv-2014authorkit/latex/method.tex
	3dv-2014authorkit/latex/result.tex
	3dv-2014authorkit/latex/sim_eval.tex