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-388 Added more details about avoiding and trouble-shooting errors caused by JAR conflicts between JBoss and Liferay
LRDOCS-478 Refactored portal properties parser to list active and inactive
    values in distinct groups
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.
Rebuild properties converter to use portal-service.jar
Updates to ADT section
ch 13 PACL plugin development
ch 13 PACL - remove JDK notes. Put into 6.1.x version instead.
Merge branch 'master' into LRDOCS-384-pacl-gen
LRDOCS-497 Updated General Message Boards configuration section, added some more detail about user subscriptions to Message Boards threads
LRDOCS-497 Added information to Message Boards section of User Guide covering distiniction between user subscriptions and mailing lists, the features of each, and how to enable them
LRDOCS-497 Clarified section on mail subdomains and the difference in behavior when enabled/disabled; also added note that globally scoped message boards do not support user subscription notifications or mailing lists
LRDOCS-497 Changed 'Reply To' address to 'Email From' address since it's called 'Email From' in the Message Board portlet's preferences
Merge pull request #463 from jrao/LRDOCS-388

https://issues.liferay.com/browse/LRDOCS-388
Merge pull request #465 from jrao/LRDOCS-478

http://issues.liferay.com/browse/LRDOCS-417
Merge pull request #467 from codyhoag/adt-framework

Updates to ADT section
Merge pull request #468 from jhinkey/LRDOCS-384-pacl-gen

LRDOCS-384 PACL - plugin development
Merge pull request #469 from jrao/LRDOCS-497

http://issues.liferay.com/browse/LRDOCS-497
Fix MS Office path image