From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 7 Dec 2015 19:00:51 +0000 (-0500)
Subject: Merge branch 'develop' into feature/settingPage
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ffeature%2FsettingPage;p=WP-Plugins%2Fglm-employment.git

Merge branch 'develop' into feature/settingPage
---

b98cb8aadfe317cfbd0edc1abca3a4a7b7f0f849