Updated C interface
Merge branch 'master' into working

Conflicts:
	GenericContainer.xcodeproj/project.xcworkspace/xcuserdata/enrico.xcuserdatad/UserInterfaceState.xcuserstate
Sligly modification of C Interface