Manual merge from kikupon_ios_test
Rollback requiered parts
Merge pull request #1 from kikupon/merge_kakui_test

Manual merge from kikupon_ios_test