fixes incorrect use of instancetype
lets dictionaryWithJSON: return nil, it should be safe.
Merge branch 'master' of github.com:NudgeApps/Annex
use proper format specifiers for NSInteger
Adds defined conditional for including Core Data
Merge branch 'master' of github.com:NudgeApps/Annex
Removes CoreData categories from general .h include
Removes CoreData framework from build phase
Fixes deprication for iOS7 in UITextView category that gets size
Adds macro to surpress deprication
Merge branch 'master' of https://github.com/wess/Annex

Conflicts:
	Annex.xcodeproj/project.xcworkspace/xcshareddata/Annex.xccheckout
	Annex/AnnexKeyChain.m
fix logic error in withoutNulls
Merge branch 'master' of github.com:wess/Annex

Conflicts:
	Annex/AnnexKeyChain.m
Merge branch 'master' of github.com:NudgeApps/Annex

Conflicts:
	Annex/AnnexKeyChain.m
Merge branch 'master' of github.com:quirkyinc/Annex

Conflicts:
	Annex.xcodeproj/project.xcworkspace/xcshareddata/Annex.xccheckout
	Annex/UITextView+Annex.m