Merge branch 'master' into tools-wordsmith
Merge branch 'tools-wordsmith' of https://github.com/jhinkey/liferay-docs into tools-wordsmith
Editing ADT section.
API chapter, ADT section, editing and wordsmithing.
LRDOCS 346, Editing Eduardo's text for clarity.
Initial edits made, work on intro still to be done.
Merge branch 'tools-wordsmith' of https://github.com/rbohl/liferay-docs into api-alloyui
LRDOCS-729 Outline new section on upgrading portlets to AlloyUI 2.0. Add tool install instructions.
More work on intro
LRDOCS 346, ADTs section ready for publication.
LRDOCS-729 Liferay AlloyUI Upgrade Tool instructions and example.
Merge branch 'tools-wordsmith' of https://github.com/rbohl/liferay-docs into adt-api
LRDOCS 346 Wordsmith and add review comments.
Merge branch 'master' into adt-api

Conflicts:
	devGuide/en/chapters/14-apis.markdown
Merge branch 'adt-api' into api-alloyui

Conflicts:
	devGuide/en/chapters/14-apis.markdown
LRDOCS-729 Explain the changes required to migrate to AlloyUI 2.0.
AlloyUI API minor edits
LRDOCS-729 Update AlloyUI migration header IDs
Update API chapter instructions for contributors. Add transition from intro to ADT section. Remove unneeded placeholder comment.
Merge pull request #788 from jhinkey/api-alloyui

AlloyUI API changes Part II