Monthly merge from master to lams31
Conflicts:
lams_build/3rdParty.userlibraries
lams_build/build.xml
lams_build/conf/j2ee/jboss-deployment-structure.xml
lams_build/lib/lams/lams.jar
lams_build/liblist.txt
lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java