Merge branch 'develop' into bug/JAL-2510amendFeatures
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 17 May 2017 07:59:07 +0000 (08:59 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 17 May 2017 07:59:07 +0000 (08:59 +0100)
commit042eef584b03e4bfa12cb048d19c269f13588aa6
tree134e24f9af1cb52fd3ef11b4ab20febcb0f5a4e4
parentd3792892a182540d35193a6aa93072197955e2a5
parent499d28231522cf0f831b4d3acf944f00c8ece3a4
Merge branch 'develop' into bug/JAL-2510amendFeatures

Conflicts:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
resources/lang/Messages.properties
resources/lang/Messages_es.properties