LERGO-268 - recompiling the template on each change. this resolves issue where removed elements should reappear.
Merge remote-tracking branch 'origin/develop' into develop