From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 30 Mar 2016 20:15:55 +0000 (-0400)
Subject: Merge tag 'v1.0.9' into develop
X-Git-Tag: v1.0.17^2~8
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e1c3204080a9fa2d2bfaa6a22ea03210fadbcf45;p=web%2FSooLocks.git

Merge tag 'v1.0.9' into develop

v1.0.9

Conflicts:
	templates/template.html
---

e1c3204080a9fa2d2bfaa6a22ea03210fadbcf45