new version
new version
new version
Merge branch 'working' into develop

Conflicts:
	.DS_Store
	PayBook.xcodeproj/project.xcworkspace/xcuserdata/isaacs.xcuserdatad/UserInterfaceState.xcuserstate
new version