Merge tag 'v1.0.7' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 5 Aug 2016 18:31:38 +0000 (14:31 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 5 Aug 2016 18:31:38 +0000 (14:31 -0400)
added capability to use category images for the category page featured image


Trivial merge