Merge branch 'master' into Clélia
commitNati
Merge branch 'master' into Clélia

Conflicts:
	MVC/index.html
AdvancedResearch
Merge branch 'Clélia'
AdvancedResearchId
Merge branch 'Clélia'