System module front-end code update
Merge remote-tracking branch 'upstream/develop'
'disable-selected' word wrong
Merge pull request #130 from sexnothing/master

System module front-end code update