Ongoing demo
Ongoing demo
Merge from Ale
Ongoing demo
Merge remote-tracking branch 'origin/master'

Conflicts:
	modContext/src/main/resources/js/figures/MDAvatar.js
	modContext/src/main/resources/js/figures/MDNewsTicker.js