Merge branch 'settings' into development
authorDarren <darren@darrenwhitlen.com>
Sat, 10 Aug 2013 18:34:59 +0000 (19:34 +0100)
committerDarren <darren@darrenwhitlen.com>
Sat, 10 Aug 2013 18:34:59 +0000 (19:34 +0100)

Trivial merge