Merge branch 'master' into ide-updates
LRDOCS-863 Beginning updates for new IDE 2.0
Merge branch 'ide-updates' of git://github.com/jhinkey/liferay-docs into ide-updates
Merge branch 'ide-updates' of git://github.com/jhinkey/liferay-docs into ide-updates
LRDOCS-863 Update Event Listing portlet steps for IDE 2.0
LRDOCS-863 Update screenshots for rest of IDE 2.0 content
LRDOCS-878 Updated Hook chapter for IDE 2.0
Merge branch 'ide-updates' of https://github.com/codyhoag/liferay-docs into ide-updates
LRDOCS-878 Updated Hook chapter images for IDE 2.0
LRDOCS-866 Updated the Layout templates section of the Dev Guide to 6.2, explained the use of Alloy Bootstrap's 12 column grid layout, removed the sections on Dev Studio's layout template editor, added instructions on creating layout templates in text editor. (Dev Studio 2.0 does not support visual layout template editor, maybe future versions will)
LRDOCS-866 Updated screenshot of layout template source for 6.2, explained that you can use HTML editor to edit layout templates
LRDOCS-863 Moved the default portlet tear-out to the end of the deployment section.
Merge branch 'LRDOCS-866' of https://github.com/jrao/liferay-docs into ide-updates
LRDOCS-863 Fixed my typo.