added GNU license
Merge branch 'master' of github.com:kwilkins/wordpress

Conflicts:
	content-collection-display/README.txt
	content-collection-display/content-chooser.php