main.js

Merge branch 'master' into develop
# Conflicts:
# lams_admin/conf/language/lams/ApplicationResources.properties
# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
# lams_monitoring/conf/language/lams/ApplicationResources.properties
# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_chat/conf/language/lams/ApplicationResources.properties
# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_daco/conf/language/lams/ApplicationResources.properties
# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_forum/conf/language/lams/ApplicationResources.properties
# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_images/conf/language/lams/ApplicationResources.properties
# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_imscc/conf/language/lams/ApplicationResources.properties
# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_leader/conf/language/lams/ApplicationResources.properties
# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_nb/conf/language/lams/ApplicationResources.properties
# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_preview/conf/language/lams/ApplicationResources.properties
# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_scribe/conf/language/lams/ApplicationResources.properties
# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_survey/conf/language/lams/ApplicationResources.properties
# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_task/conf/language/lams/ApplicationResources.properties
# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_vote/conf/language/lams/ApplicationResources.properties
# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties