LRDOCS-739 Manually resolved minor merge conflict involving whitespace
LRDOCS-739 QA and updated up to the SOAP client section in the Dev Guide's remote services chapter
LRDOCS-739 Added some explanation to section on creating remote service clients
LRDOCS-739 DG remote services updates
QA updates to DG remote services chapter. Added instruction to sign in to portal as administrator before trying to invoke remote services via JSON WS interface
LRDOCS-739 Finished QA updates to remote services ch of the DG. Added a little more detail to ch summary
LRDOCS-739 Fixed typo: 'authenicate' -> 'authenticate'
LRDOCS-739 Added note that the portal authentication type must be set to either by screen name or by user ID in order for remote service calls to be authenticated.
LRDOCS-739 Updated DG's remote services chapter to reflect the fact that the '/secure' has been removed from remote service URLs since all of Liferay's remote web services require authentication. There are no longer separate 'secured' and 'unsecured' web service URLs
LRDOCS-818 Fix the section on extending a JSP. Use Liferay IDE in creating a custom JSP.
LRDOCS-739 Updated PHP SOAP web services client for Liferay 6.2
LRDOCS-811: Rewrite Google Map gadget
LRDOCS-811: Update Google Map gadget references and image
Merge branch 'opensocial-map-ex' of https://github.com/codyhoag/liferay-docs into opensocial-map-ex
Merge branch 'LRDOCS-739' of https://github.com/jrao/liferay-docs into LRDOCS-739-remote-services
LRDOCS-739 Wordsmith
LRDOCS-741: Update Workflow (inside portal) sections for 6.2
LRDOCS-329 Added instructions for configuring the SAML 2.0 EE app on Liferay 6.2
LRDOCS-329 Added note that it's possible to configure Liferay as IdP or SP via portal-ext.properties but it's recommended to use the SAML Control Panel interface since it marks required fields and validates some fields
LRDOCS-739 Fix image links and format code/text to 80 columns.