NIHVIVO-1304 Rewrote widget framework to support a single template per widget, with multiple macros in each template file.

webapp/web/templates/freemarker/widgets/widget-test.ftl

@@ -9,8 +9,16 @@
 </#macro>
 
 <#macro markup>
+<#import "lib-list.ftl" as l>
     <div class="testWidget">
-        <h4>This is the test widget.</h4>    
+        <h4>This is the test widget using macros.</h4>    
         <p>I like ${fruit}.</p>
     </div>
+</#macro>
+
+<#macro altMarkup>
+    <div class="testWidget">
+        <h4>This is the alternate version of the test widget.</h4>    
+        <p>I hate ${fruit}.</p>
+    </div>
 </#macro>