fixed various typos
LRDOCS-437 remove devGuide's preface markdown file
Merge branch 'devGuide-intro' into devGuide-update
Added draft for the Recycle Bin
Added Q/A comments for review
LRDOCS-339, Added instruction to Liferay installation section to check that the Java -Dfile.encoding=UTF-8 parameter is set in Liferay's application server before proceeding
LRDOCS-401, Removed instruction to add the
ehcache.cluster.link.replication=true property (this property was wrong,
the correct one is ehcache.cluster.link.replication.enabled=true), clarified and
reorganized the cluster link and distributed caching sections
Editing for brevity and clarity.  Minor changes made to dev guide intro chapter only.  Paragraph two will be reworked to make more concise.
Front-ported changes from 6.1.x branch.
Merge branch 'recycle-bin' of git://github.com/codyhoag/liferay-docs into cody-recyclebin
Changed third second-level heading '##Choosing the right tool for the job' to '##Choosing your development tools'. Attempted to smooth out the two introductory paragraphs, trying to make them more clear and inviting. Tried to make the introduction more accurately reflect what is discussed in the chapter. Removed short descriptions of Portlets and OpenSocial Gadgets since their longer descriptions (third level headings) immediately followed them.  Added any information from the shorter descriptions that was not included in the longer descriptions. Other general edits were made to improve sentence structure and clarity.
Wordsmithing.
Merge pull request #15 from sez11a/cody-recyclebin

Wordsmithed, answered questions, and made some comments
Wordsmith dev guide introduction chapter
Merge branch 'master' into LRDOCS-339
removed sentence about JAVA_OPTS environment variable since it's just a convention to use JAVA_OPTS on some, not all, app servers
Merge pull request #414 from jrao/LRDOCS-339

http://issues.liferay.com/browse/LRDOCS-339
Merge pull request #415 from jrao/LRDOCS-401

http://issues.liferay.com/browse/LRDOCS-401
General editing for clarity and conciseness.  Removed the note that we already introduced the presence of a portlets folder since I did not see it.  Perhaps it was referring to the last chapter which is the Plugins SDK chapter, but I think the chapter should be a self-contained unit.
Merge branch 'DEVGUIDEwordsmith' of https://github.com/jhinkey/liferay-docs into DEVGUIDEwordsmith to see changes made and continue working on dev guide wordsmithing task