Revert f5965ac..adeef38

This rolls back to commit f5965ac607d4b12a5b516395470a69fcdff19e73.
draft
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/images/Presentation2.pptx
	3dv-2014authorkit/latex/images/otherresult2.pdf
	3dv-2014authorkit/latex/images/pipeline.pdf
	3dv-2014authorkit/latex/images/similarparts.pdf
	3dv-2014authorkit/latex/method.tex
	3dv-2014authorkit/latex/result.tex
	3dv-2014authorkit/latex/sim_eval.tex
Merge branch 'master' of https://github.com/sueraphael/paper