in progress for 1.alpha
Merge branch 'master' of https://github.com/jcronier/rok

Conflicts:
	rok.project/TODO.txt
	rok.project/rok.core/src/main/java/rok/model/AbstractMClass.java
	rok.project/rok.core/src/main/java/rok/model/PropertyType.java
	rok.project/rok.core/src/main/java/rok/model/metadata/Channel.java
	rok.project/rok.core/src/main/java/rok/model/metadata/Ticket.java
	rok.project/rok.core/src/main/java/rok/model/property/PropertyImpl.java
	rok.project/rok.samples/library-management-system/model/lms.rok-model
	rok.project/rok.samples/library-management-system/src/main/java/commun/Individu.java
	rok.project/rok.samples/library-management-system/src/main/java/library/Auteur.java
	rok.project/rok.samples/library-management-system/src/main/java/library/Bureau.java
	rok.project/rok.samples/library-management-system/src/main/java/library/Compte.java
	rok.project/rok.samples/library-management-system/src/main/java/library/Editeur.java
	rok.project/rok.samples/library-management-system/src/main/java/library/Genre.java
	rok.project/rok.samples/library-management-system/src/main/java/library/Livre.java
	rok.project/rok.samples/library-management-system/src/main/java/library/Mediatheque.java
	rok.project/rok.samples/library-management-system/src/main/java/library/Reservation.java
	rok.project/rok.samples/library-management-system/src/main/java/library/Responsable.java
	rok.project/rok.samples/library-management-system/src/test/java/library/LibraryTest.java
	rok.project/rok.tools/rok.edit/icons/full/ctool16/CreateComposedEntityListProperty_type_MClass.gif
	rok.project/rok.tools/rok.edit/icons/full/ctool16/CreateMClass_properties_EnumerationProperty.gif
	rok.project/rok.tools/rok.edit/icons/full/ctool16/CreateMClass_properties_InnerProperty.gif
	rok.project/rok.tools/rok.edit/plugin.properties
	rok.project/rok.tools/rok.edit/src/rok/model/property/provider/AggregatedEntityListPropertyItemProvider.java
	rok.project/rok.tools/rok.edit/src/rok/model/property/provider/ComposedEntityListPropertyItemProvider.java
	rok.project/rok.tools/rok.edit/src/rok/model/property/provider/EntityPropertyItemProvider.java
	rok.project/rok.tools/rok.edit/src/rok/model/property/provider/InnerPropertyItemProvider.java
	rok.project/rok.tools/rok.edit/src/rok/model/property/provider/PropertyItemProviderAdapterFactory.java
	rok.project/rok.tools/rok.edit/src/rok/model/provider/MClassItemProvider.java
	rok.project/rok.tools/rok.generator.java/src/rok/generator/java/template/common.mtl
	rok.project/rok.tools/rok.generator.java/src/rok/generator/java/template/entity.mtl
	rok.project/rok.tools/rok.generator.java/src/rok/generator/java/template/mClass.mtl
	rok.project/rok.tools/rok.generator.java/src/rok/generator/service/RokServices.java
	rok.project/rok.tools/rok/model/rok.ecore
	rok.project/rok.tools/rok/model/rok.ecorediag
	rok.project/rok.tools/rok/src/rok/model/Ref.java
	rok.project/rok.tools/rok/src/rok/model/impl/ModelPackageImpl.java
	rok.project/rok.tools/rok/src/rok/model/property/AggregatedEntityListProperty.java
	rok.project/rok.tools/rok/src/rok/model/property/ComposedEntityListProperty.java
	rok.project/rok.tools/rok/src/rok/model/property/EntityProperty.java
	rok.project/rok.tools/rok/src/rok/model/property/InnerProperty.java
	rok.project/rok.tools/rok/src/rok/model/property/PropertyFactory.java
	rok.project/rok.tools/rok/src/rok/model/property/PropertyPackage.java
	rok.project/rok.tools/rok/src/rok/model/property/impl/AggregatedEntityListPropertyImpl.java
	rok.project/rok.tools/rok/src/rok/model/property/impl/ComposedEntityListPropertyImpl.java
	rok.project/rok.tools/rok/src/rok/model/property/impl/EntityPropertyImpl.java
	rok.project/rok.tools/rok/src/rok/model/property/impl/InnerPropertyImpl.java
	rok.project/rok.tools/rok/src/rok/model/property/impl/PropertyFactoryImpl.java
	rok.project/rok.tools/rok/src/rok/model/property/impl/PropertyPackageImpl.java
	rok.project/rok.tools/rok/src/rok/model/property/util/PropertyAdapterFactory.java
	rok.project/rok.tools/rok/src/rok/model/property/util/PropertySwitch.java