fix bug#2389 : GLPI 'Softwares'->'Software'
Merge branch 'master' of https://github.com/inkhey/mmc