Merge branch 'master' of https://github.com/ddarmon/sfi-dynComm

Conflicts:
	paper/paper.tex
paper
paper
junk conflict