mak as merge
Merge branch 'master' of
https://github.com/genericsystem/genericsystem2011.git

Conflicts:
	genericsystem-myadmin/src/main/webapp/pages/typesmanager/edit.xhtml
mark as merged
Merge branch 'master' of
https://github.com/genericsystem/genericsystem2011.git

Conflicts:
	genericsystem-myadmin/src/main/java/org/genericsystem/myadmin/beans/TypesBean.java
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
implement addProperty