Merges trunk HEAD

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/webhelp-2012-12-07@1564402 13f79535-47bb-0310-9956-ffa450edef68