Fix an error in using fetchRequestController.
Fix an error in CreateWordListViewController
Merge branch 'hotfix/README' into develop
models for note
modify attachment
new method to create word list
Merge branch 'develop' of gitcafe.com:hikui/Vocabulary into develop

Conflicts:
	Vocabulary.xcodeproj/project.pbxproj
	Vocabulary/AppDelegate.m
Merge commit 'bd22608fc76bc7a29e8ce35f0598e58161c1ac80'
Merge commit 'd3c3aa16f4bdf3888f700c55fc62375a28f9d944'

Conflicts:
	Vocabulary.xcodeproj/project.pbxproj
	Vocabulary/AppDelegate.m
Merge branch 'release/3.1.0_beta2'

Conflicts:
	Vocabulary/AppDelegate.m