no message
no message
no message
no message
Merge branch 'release/V1.3' into develop

Conflicts:
	Testing/Testing.xcodeproj/project.xcworkspace/xcuserdata/jimmy.xcuserdatad/UserInterfaceState.xcuserstate
added develop controller
Merge branch 'develop'

* develop:
  added develop controller
  no message
  no message
  no message
  no message

Conflicts:
	Testing/Testing.xcodeproj/project.xcworkspace/xcuserdata/jimmy.xcuserdatad/UserInterfaceState.xcuserstate