Liferay ui taglibs 2

I believe everything is rebased and resolved now. Let me know if anything needs changed. Thanks for the help!