mark as merged
Merge branch 'master' of
https://github.com/genericsystem/genericsystem2011.git

Conflicts:
	genericsystem-myadmin/src/main/webapp/pages/typesmanager/edit.xhtml
	genericsystem-myadmin/src/main/webapp/pages/typesmanager/tree.xhtml