Merge origin/development into layout

Conflicts:
	public/js/addanswers.js
	public/js/validation.js
	src/Mctesting/view/testlist.html.twig
Merge origin/development into development
Merge origin/development into layout

Conflicts:
	public/js/addanswers.js
	public/js/validation.js
	src/Mctesting/view/testlist.html.twig