Merge branch 'master' of github.com:rizumita/CoreData-Typhoon-iOS