From: Ove Klykken <klykken@gmail.com>
Date: Tue, 10 Jun 2014 18:26:45 +0000 (-0400)
Subject: Merge branch 'feature/template' into develop
X-Git-Tag: v1.0^2~78
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=71bb20cf05db17193551d5e9de4ae539e06ba25f;p=web%2FSooLocks.git

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

71bb20cf05db17193551d5e9de4ae539e06ba25f