Merge branch 'feature/NewSettings' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Sat, 3 Oct 2015 16:04:54 +0000 (12:04 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Sat, 3 Oct 2015 16:04:54 +0000 (12:04 -0400)

Trivial merge