Merge branch 'features/JAL-1641_JSON-tests-and-docs' into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 30 Jun 2015 11:42:25 +0000 (12:42 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 30 Jun 2015 11:42:25 +0000 (12:42 +0100)

Trivial merge