Merge branch 'features/JAL-1641_JSON_' into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 11 May 2015 09:44:16 +0000 (10:44 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 11 May 2015 09:44:16 +0000 (10:44 +0100)

Trivial merge