Merge branch 'dev-guide-03-portlets-6.2' into trunk-dev-guide
devGuide - portlets Update image number
devGuide - portlets - Fix resource bundle XML.
devGuide - portlets - Fix resource bundle XML and mention mavenizing the bundle.
Merge branch 'LRDOCS-745' into trunk-dev-guide
Dev Guide - frameworks - Edit JSON Web Service section.
Merge branch 'master' into trunk-dev-guide
LRDOCS-810 Fix localizing titles and descriptions used in the Control Panel for multiple portlets in the same project.
Merge branch 'opensocial-dev-guide2' into trunk-dev-guide
Dev Guide - frameworks - Fix typo at start of Mapping and Naming Conventions section. Format to 80 columns.
LRDOCS-810 Reorganize the localization sections.
LRDOCS-810 Add a translated language key to the portlets and show the results.
Updating Portlets Localization section.
LRDOCS-808: Add more detail for organization site memberships
Merge branch 'master' into devguide-ch-5

Conflicts:
	devGuide/en/chapters/05-remote-services.markdown
Removed setup wizard sections from individual app server sections.
Localization QA. Fixed view.jsp call of the wecome-x
Language.properties key. Minor grammatical edits.
Merge branch 'dev-guide-03-portlets-6.2' of https://github.com/rbohl/liferay-docs into LRDOCS-810-localization

Conflicts:
	devGuide/en/chapters/03-portlet-development.markdown
Merge pull request #714 from jhinkey/devguide-ch-5

6.2 JSON Web Services - Edited
Merge pull request #719 from jrao/LRDOCS-819

https://issues.liferay.com/browse/LRDOCS-819