Merge remote-tracking branch 'upstream/master'
changed the layout of the list and add optional flag for BIOS
changed the layout of the list and add optional flag for BIOS
Merge branch 'master' of github.com:fr500/RetroArch

Conflicts:
	frontend/menu/menu_common.c
fix spacing
fix spacing again
Merge pull request #592 from fr500/master

Added optional flag to firmware