SameAttributesForDifferentEntities
Merge branch 'master' of https://github.com/Nero-Jason-Yang/Research

Conflicts:
	Database/App/ViewController.m
	Database/App/en.lproj/MainStoryboard_iPhone.storyboard
	Database/Database.xcodeproj/project.pbxproj