Heavy and Extra-heavy Oil Upgrading Technologies