Calculation of quarkonium spectrum and m(b), m(c) to order alpha-s**4