Selection
Merge branch 'master' of https://github.com/LazyGenerators/project

Conflicts:
	eliphas/data/templates/ecore/exam_questions.html