fix apt-get
Merge branch 'fix' into v2.5.1-rc1

Conflicts:
	src/plugins/01_software/public/js/controller.js