wrote first draft of docs for new calendar portlet
merged master into new-calendar-portlet branch, fixed merge conflict
Merge pull request #352 from jrao/new-calendar-portlet

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