Merge origin/master

Conflicts:
	src/ABC/AdmissionBundle/Resources/views/ApplicantAdmin/show.html.twig
Merge origin/master