Merge pull request #1 from mlund/master

update
Hertz and YukawaGel potentials and rdf
update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/faunus/analysis.h
	src/examples/CMakeLists.txt
	src/examples/stockmayer.cpp
	src/examples/stockmayer.input
	src/examples/stockmayer.json
Merge pull request #12 from alab0329/master

merge