fix disk_next, add option for disk_prev
Merge branch 'master' of github.com:fr500/RetroArch
Merge pull request #1101 from fr500/master

fix issue 1097
Merge pull request #1102 from aliaspider/master

stop using thr->frame.within_thread for thread_set_osd_msg.
(Menu) Remove menu->last_time - unused
Avoid usage of term 'emulator'