Initial component work
Merge branch 'master' of github.com:kenfinnigan/portlet-component

Conflicts:
	.gitignore