...
Merge branch 'master' of https://github.com/edWAR6/Jaguar

Conflicts:

jaguar.xcodeproj/project.xcworkspace/xcuserdata/edWAR6.xcuserdatad/UserI
nterfaceState.xcuserstate