Merge branch 'lams31' into
LDEV-4440Conflicts:
lams_build/3rdParty.userlibraries
lams_build/lib/lams/lams-central.jar
lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag