Masato Okado Osaka University Geometric Aspects of Discrete and Ultra-discrete Integrable Systems