Changed run.bat to be a menu, similar to run.sh
Merge remote-tracking branch 'origin/master'