Dev Guide reorg., integrated Liferay Deprecation policy with transition.
Refactored Service Builder chapter headings.
Added a comment to Remote Services chapter.
Dev Guide reorg., added a transition into the new content and removed
now incorrect information from the summary.
Dev Guide reorg., updated Chapter title for
07-assets-and-advanced-frameworks, fixed summary, added comment.
LRDOCS-619 Added note that users' time zone must match the portal's time zone in order for the dates in the notification emails to match the dates of the event; User Guide already includes information about event notification emails
Merge branch 'master' into LRDOCS-317
Dev Guide reorg., changed title.
LRDOCS-600: Generic templates for WCM
LRDOCS-600: Generic templates for DDL
LRDOCS-660: Generic templates for ADT
LRDOCS-649: Comments and Ratings portlets no longer able to be exported
Merge branch 'master' into dev-tools-master-based

Conflicts:
	devGuide/en/chapters/04-service-builder.markdown
	devGuide/en/chapters/06-service-resource-frameworks.markdown
	devGuide/en/chapters/07-assets-and-advanced-frameworks.markdown
	devGuide/en/chapters/08-workflow.markdown
Minor commit.
Renamed chapter 6 (file name and chapter name) and combined contents
with chapter 7 according to dev-guide-outline Google Doc.
LRDOCS-622 Added coverage of the fact that calendar resources can make use of tags and categories. Removed section that said that a resource type could be selected based on a list in the calendar portlet's portlet.properties file; this no longer appears to be the case
LRDOCS-627 Added explanation of how to configure whether or not comments and ratings are enabled for calendar events
LRDOCS-625 Added explanation of how to customize event invitation and event reminder emails
Dev Guide Reorg chapter and section heading rename task. Right now there
is some inconsistency in section heading capitalization.
LRDOCS-626 Added note that the 6.2 Calendar portlet supports social activities; mentioned that adding/updating calendar events will appear in all the appropriate portlets such as the Activities portlet, Friends' Activities portlet, and Members' Actvities portlet