12.12.2017
Merge branch 'develop' # Conflicts: # example-planes/example-planes.xcodeproj/project.xcworkspace/xcuserdata/joschow1.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'develop' # Conflicts: # example-planes/example-planes.xcodeproj/project.xcworkspace/xcuserdata/joschow1.xcuserdatad/UserInterfaceState.xcuserstate