Expansion of the Non-condensed Trapped Bose Gas in Bose-Einstein Condensation