docu
Merge remote-tracking branch 'origin/master'

Conflicts:
	cyclop-wicket-components/README.md