Progress in String Theory and M-Theory