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
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
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
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
LRDOCS-628 Added explanation of the Edit Event screen's Permissions button which allows Event permissions to be configured
LRDOCS-317 Punctuation and capitalization
Merge pull request #577 from jrao/LRDOCS-317

http://issues.liferay.com/browse/LRDOCS-619
Merge pull request #580 from codyhoag/generic-temp

Generic templates
Merge pull request #581 from codyhoag/comments-ratings

LRDOCS-649: Comments and Ratings portlets no longer able to be exported
Merge pull request #583 from rbohl/dev-tools-master-based

Dev tools master based
Merge branch 'master' into reorg