commit previous changes by jerome before merge with eric changes
...
...
Merge branch 'master' of github.com:FreeMedForms/freemedforms

Conflicts:
	science/rmll2014Markdown/presentation.md