Integrated origin/ready/adam
Merge branch 'master' of github.com:JCICPH/jcicph.github.io into adam

Conflicts:
	agenda/index.md