ipad対応
Merge branch 'finalize_20140826'