LRDOCS-733 Added extra explanation of the Plugins Configuration section of the Control Panel
LRDOCS-733 Manual merge of master into LRDOCS-733 branch; fixed small merge conflict in Liferay Marketplace chapter
Merge pull request #646 from jrao/LRDOCS-733

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