From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 28 Jun 2016 18:45:02 +0000 (-0400)
Subject: Merge tag 'v1.0.16' into develop
X-Git-Tag: v1.1.0^2~15
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=42df7d2d3ce9431775c32a5a59292f6ba8cb34cd;p=WP-Themes%2Fwesternup.git

Merge tag 'v1.0.16' into develop

v1.0.16

Conflicts:
	scss/plugins/_memberdb.scss
---

42df7d2d3ce9431775c32a5a59292f6ba8cb34cd