Merge origin/master

Conflicts:
	test/ca/qc/bdeb/p56/nsamessenger/vue/FXMLControllerChatTest.java