wrote first draft of docs for new calendar portlet
Added Maven section
Merge branch 'master' into maven-dg
Merge remote-tracking branch 'codyhoag/maven-dg' into maven-dg
maven edits and wordsmithing
hard returns in several areas
Merge remote-tracking branch 'codyhoag/maven-dg' into maven-dg
updated maven with more settings and instructions
Merge remote-tracking branch 'codyhoag/maven-dg' into maven-dg
Prepared repo for documenting Liferay 6.2
add ADT section in user guide
fix image numbers and use hard returns
wordsmith
merged master into new-calendar-portlet branch, fixed merge conflict
Merge branch 'adt-framework' of git://github.com/codyhoag/liferay-docs into cody-adt

Conflicts:
	userGuide/en/chapters/03-advanced-web-content-management.markdown
Wordsmithing.
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