ApplicationResources.properties

Merge remote-tracking branch 'origin/master' into develop
Conflicts:
lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java