ES system settings are set individually for each system (issue #403)
Merge branch 'master' of https://github.com/petrockblog/RetroPie-Setup

Conflicts:
	scriptmodules/emulators/mupen64rpi.sh
	scriptmodules/supplementary/emulationstation.sh