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

Conflicts:
	genericsystem-example-jsf/.gitignore
merge
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
merge
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
generic component commit
add GenericComponent