updated email with links
build
Merge branch 'master' of https://github.com/bbugs280/settle

Conflicts:

platforms/ios/Settle.xcodeproj/project.xcworkspace/xcuserdata/vincent.xc
userdatad/UserInterfaceState.xcuserstate