Rename And Document split_to_text Method
Merge branch 'develop' into feature/alterations-to-diff-tool-1393
Gets The View At Least Working Again
Make Variables More Verbose
Merge branch 'develop' into feature/alterations-to-diff-tool-1393
Neaten Everything Up
Merge branch 'develop' into feature/alterations-to-diff-tool-1393
Merge branch 'develop' into feature/alterations-to-diff-tool-1393
Fixed the case in the names of the json files for global settings and programme settings
Programme settings on save bug

Fixed the bug where programme settings weren't being saved because revisionable was only working for programmes
New migration for the 'empty_default_value' field in global_settings

Previously only added for programme settings
Tests for global setting and programme setting on save

This basically tests that the revisionable save mechanism works for global and programme settings as well as just programmes
Merge pull request #74 from unikent/feature/alterations-to-diff-tool-1393

Fix Diff Tool (Partial Completion)
Merge pull request #169 from unikent/bug/global-setting-save

Bug/global setting save
Merge branch 'develop' into feature/redo-revisions-system

Conflicts:
	application/controllers/api.php
	application/controllers/programmes.php
	application/controllers/programmesettings.php
	application/models/revisionable.php
Laravel style function bracketing
Correct Spelling
Laravel style conditionals
Correct indentation
Further stylistic elements