Merge branch 'Solution'
Add edit capability
Merge branch 'master' into Solution

Conflicts:

MovieQuotes/MovieQuotes.xcodeproj/project.xcworkspace/xcuserdata/fisherd
s.xcuserdatad/UserInterfaceState.xcuserstate