Merge remote-tracking branch 'origin/master'

Conflicts:
	Paper/Photon_Interference.aux
	Paper/Photon_Interference.log
	Paper/Photon_Interference.pdf
	Paper/Photon_Interference.synctex.gz