Merge branch 'hotfix/ShopHeading'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 14:45:49 +0000 (09:45 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 3 Mar 2015 14:45:49 +0000 (09:45 -0500)

Trivial merge