LRDOCS-490 Add the addition of the "support-tomcat.jar" to the errata article
LRDOCS-490 Add to errata that Liferay 6.1 users should disregard the note explaining problems with ccpp.jar file
Adding steps for using LCS portlet behind a proxy.
Merge pull request #1097 from codyhoag/support-tomcat-6.1.x

Tomcat 7 Minor Updates for 6.1.x
Merge pull request #1104 from ngaskill/LCS-proxy-6.1.x

LCS proxy update for 6.1.x
Remove unneeded old reference article
Add Development Reference doc for 6.1
Ignore *.zip files
Don't ignore .METADATA files
Discover > Reference article and file structure
Adding info on LCS roles, and permissions matrix for those roles.
Wordsmithing.
Merge branch '6.1.x' of github.com:sez11a/liferay-docs into 6.1.x
Wordsmithing.
Merge branch 'pr-1113' into 6.1.x
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