LRDOCS 340 and 436--Continuing in Chapter 7, formatting and wordsmithing.
LRDOCS340 and 436, minor commits before merging in upstream master
Merge branch 'master' into DEVGUIDEwordsmith; Resolved conflicts in devGuide/en/chapters/07-ext-plugins.markdown

Conflicts:
	devGuide/en/chapters/07-ext-plugins.markdown
Chapter 7 LRDOCS 340 and 436--Near completion.
LRDOCS340 and 436, Chapter 7--Ext plugins-->Chapter 7 Wordsmithing and formatting now complete and ready for review.
LRDOCS340 and 436 Chapter 8 Maven.  Began wordsmithing and formatting.  Removed bold text in favor of fourth level (####) headings throughout.
LRDOCS 340 and 436 Wordsmithing and Formatting--Chapter 8, Maven.  Continuing, worked on heading capitalization and general wordsmithing and formatting.
LRDOCS 340 and 436, Wordsmithing and Formatting--Continuing in Chapter 8, Maven.
Merge branch 'master' into DEVGUIDEwordsmith
LRDOCS 340 and 436--Chapter 8, Maven--still.  Nearing completion.
Removed StringUtil and StringUtil references from PropertiesBundler.java since the portal properties converter no longer resides in liferay-portal; copied StringUtil's replaceLast(String, String, String) method into PropertiesBundler.java
LRDOCS 340 and 436, Formatting and Wordsmithing, Chapter 8, Maven--
Completed wordsmithing and formatting.  This chapter still feels rough, although at least it rips off Edgar Allen Poe and lights a cat on fire now.
LRDOCS340 and 436--Wordsmithing and formatting, Chapter 9, Liferay IDE.  Began editing introduction.
LRDOCS-388 Added more details about avoiding and trouble-shooting errors caused by JAR conflicts between JBoss and Liferay
LRDOCS 340 and 436, Formatting and Wordsmithing Chapter 9--Liferay-IDE.  Began editing chapter.
LRDOCS-478 Refactored portal properties parser to list active and inactive
    values in distinct groups
LRDOCS-333 Fixed broken link to point to correct location of Nexus installation instructions
LRDOCS340 and 436, Chapter 9, Liferay IDE--Continued wordsmithing and formatting in Chapter 9.
Add portal-service for our utilities
Revert "Removed StringUtil and StringUtil references from PropertiesBundler.java since the portal properties converter no longer resides in liferay-portal; copied StringUtil's replaceLast(String, String, String) method into PropertiesBundler.java"

This reverts commit 8f76161a10cc8caa0c5b48e761eb54feaad8aa7b.