.
Merge branch 'master' of https://github.com/shanqi/git_eccv14_pano

Conflicts:
	conclusion.tex
Merge branch 'master' of https://github.com/shanqi/git_eccv14_pano