wrote first draft of docs for new calendar portlet
merged master into new-calendar-portlet branch, fixed merge conflict
updated address in Google Maps gadget
link fixed with hard return and minor edits
Update userGuide/en/chapters/18-using-scripting.markdown

Fixed broken return separating two graphs. @sez11a
addressed LRDOCS-371, changed incorrect reference to chapter 2 to a reference to chapter 3, where Staging is covered
added section on *Add* and *Manage* menus in the Web Content section of the Control Panel
added explanation that using folders for web content articles can be very useful for sites with lots of content
updated most of 03-adv-web-content-management with new web content, structures, templates interface in control panel, need to finish by removing XML schema definition section and replace default values with predefined values
removed section on Structure Default Values and XML Schema definitions since it looks like this functionality is missing in 6.2
fixed transition from structures section to permissions on structures section
removed "ally" typo
LRDOCS-323 added kaleo email notification code snippet and snapshot
Updated versioning info and added filename specification info
DevGuide - Edit Marketplace versioning updates
documented Liferay's deprecation policy, also covering some of Liferay's versioning policy
Merge pull request #352 from jrao/new-calendar-portlet

http://issues.liferay.com/browse/LRDOCS-317
Merge pull request #358 from codyhoag/typo-dg

link fixed with hard return and minor edits
Merge pull request #361 from markhealy/ug-typo-ch18

Update userGuide/en/chapters/18-using-scripting.markdown
edited ADT section
Merge branch 'master' into adt-framework