LRDOCS-585: Update Site Templates section for 6.2
LRDOCS-586: Update Page Templates section for 6.2
Merge branch 'master' into adv-web-content-management
LRDOCS-686: WAP technology deprecated
LRDOCS-686: WAP Styling deprecated for portlet's Look and Feel
LRDOCS-620 Added documentation of the calendar portlet's export/import functionality for calendar events and resources
LRDOCS-624 Added information about the friendly URL to calendar events that's included in event invitation notification emails; this is useful because it allows users easy access to events' views in the calendar portlet so they can respond to event invitations
Merge pull request #589 from codyhoag/adv-web-content-management

Site and Page Templates for 6.2
Merge pull request #591 from codyhoag/wcm-6.2

WAP technology deprecation
Merge pull request #592 from jrao/LRDOCS-317

http://issues.liferay.com/browse/LRDOCS-620