LRDOCS-1341 Clustering JSF Portlets on GlassFish
LRDOCS-1347 Upgrading Mojarra in GlassFish 3
LRDOCS-1350 Upgrading Weld in GlassFish 3
LRDOCS-1346 Upgrading Mojarra in JBoss 7
LRDOCS-1349 Upgrading Weld in JBoss 7
LRDOCS-1507 Upgrading Mojarra in Resin 4
LRDOCS-1344 Adding Mojarra to Tomcat 7
LRDOCS-1506 Deploying JSF Portlets on WebLogic 10.3
LRDOCS-1508 Upgrading Mojarra for WebLogic 10.3 (in webapp environment)
LRDOCS-1508 Upgrading Mojarra for WebLogic 10.2 (Portlets)
LRDOCS-1342 Deploying JSF Portlets on WebSphere 8.0
LRDOCS-1345 Upgrading Mojarra for WebSphere 8.0
Merge branch '6.1.x' into jsf-config-app-servers-6.1.x

Conflicts:
       discover/using-liferay-portal/articles/20-errata/00-errata-for-uusing-liferay-portal-6-1.markdown
Merge branch '6.1.x' into jsf-config-app-servers-6.1.x

Conflicts:
	discover/using-liferay-portal/articles/20-errata/00-errata-for-using-liferay-portal-6-1.markdown
Merge branch 'jsf-config-app-servers-6.1.x' of git://github.com/codyhoag/liferay-docs into 6.1.x

Conflicts:
	discover/using-liferay-portal/articles/20-errata/00-errata-for-using-liferay-portal-6-1.markdown
Renamed folder.
Renamed folder.