javadoc
Merge branch 'master' of
https://github.com/genericsystem/genericsystem2011.git

Conflicts:
	genericsystem-api/src/main/java/org/genericsystem/api/core/Generic.java
	genericsystem-api/src/main/java/org/genericsystem/api/generic/Type.java