Merge branch 'feature/PropertyMaps' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Jul 2014 14:59:26 +0000 (10:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Jul 2014 14:59:26 +0000 (10:59 -0400)

Trivial merge