LRDOCS-726 Clarified some instructions in the Drools EE section of the User Guide
LRDOCS-711 Added section on JBoss 7's standalone mode vs domain mode, explained that standalone is fully support while domain mode is not; in particular, JBoss 7 in domain mode does not support deploying non-exploded .war files
LRDOCS-726 Fixed tiny merge conflict (formatting)
Merge pull request #654 from jrao/LRDOCS-726

http://issues.liferay.com/browse/LRDOCS-726
Merge branch 'LRDOCS-711' of github.com:jrao/liferay-docs into jboss
Wordsmithing.
Merge branch 'master' of github.com:sez11a/liferay-docs