int64_t
Merge branch 'master' of github.com:marujun/DataManager

Conflicts:
	DataManager.xcodeproj/project.xcworkspace/xcuserdata/mrj.xcuserdatad/UserInterfaceState.xcuserstate