Merge branch 'kaleo-forms' into trunk-dev-guide
Merge branch 'opensocial-map-ex' into trunk-dev-guide
Merge branch 'LRDOCS-818' into trunk-dev-guide
LRDOCS-739 Fix image links and format code/text to 80 columns.
Merge branch 'update-urls' of https://github.com/codyhoag/liferay-docs into trunk-dev-guide

Conflicts:
	devGuide/en/chapters/05-remote-services.markdown
LRDOCS-739 Remove wiki page reference.
Merge branch 'master' into trunk-dev-guide
Merge branch 'LRDOCS-720' into trunk-dev-guide
Merge branch 'LRDOCS-720' into trunk-dev-guide
Merge branch 'LRDOCS-807' into trunk-dev-guide
Merge branch 'LRDOCS-807' into trunk-dev-guide
Merge branch 'LRDOCS-807' into trunk-dev-guide
Merge branch 'devguide-marketplace-apps' into trunk-dev-guide
Merge branch 'lrdocs-572-liferay-projects' into trunk-dev-guide
Merge branch 'lrdocs-495-maven-portlet-src' into trunk-dev-guide
Merge branch 'maven-tools-and-apis' into trunk-dev-guide

Conflicts:
	devGuide/en/chapters/05-remote-services.markdown
Merge branch 'LRDOCS-773-svc-ctx-json' into trunk-dev-guide
Merge branch 'struts-action' into trunk-dev-guide
Merge branch 'LRDOCS-722' into trunk-dev-guide
Merge branch 'LRDOCS-823-web-svc-security' into trunk-dev-guide