Merged develop into master

Conflicts:
	js/adapt-contrib-boxmenu.js