Merge branch 'settings' into development
authorDarren <darren@darrenwhitlen.com>
Sat, 17 Aug 2013 17:07:04 +0000 (18:07 +0100)
committerDarren <darren@darrenwhitlen.com>
Sat, 17 Aug 2013 17:07:04 +0000 (18:07 +0100)

Trivial merge