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

Fixed broken return separating two graphs. @sez11a
Organizations heading was not working because of a comment.
Added note with link to LRDOCS-378
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