Merge branch 'master' of git.freeside.biz:/home/git/www

diff --combined index.html
index 3d0c5ff,a6e7b5e..cdfe14e
--- 1/index.html
--- 2/index.html
+++ b/index.html
@@@ -37,32 -37,32 +37,32 @@@ Full day <a href="http://www.freeside.b
            </td>
  
            <td align=top>
 -            <h4>We're exhibiting!</h4>
 +<!--            <h4>We're exhibiting!</h4> -->
              <h5>&nbsp;FISPA Live</h5>
              <h4>Feb 2-4, 2015</h4>
              <h4>New Orleans, Louisiana</h4>
 -&nbsp;&nbsp;<a href="mailto:sales@freeside.biz?subject=FISPA Live discount">Contact us</a> for a discount code
 +&nbsp;&nbsp;<a href="mailto:sales@freeside.biz?subject=FISPA Live discount">Contact us</a> for a discount code<br><br>
            </td>
          </tr>
  
 -<!--
          <tr>
            <td align="center">
 -            <a href="http://www.wispapalooza.net/" target="_blank"><img src="wispapalooza.png" border=0 align="center" alt="WISPAPalooza"></a>
 +            <a href="http://www.cvent.com/events/wispamerica-2015/event-summary-5fddb419659f4b57871bfd2d0b690a85.aspx" target="_blank"><img src="wispamerica2014.png" border=0 align="center" alt="WISPAmerica"></a>
            </td>
  
            <td align=top>
 -            <h4>We're exhibiting!</h4>
 -            <h5>&nbsp;WISPAPalooza</h5>
 -            <h4>Booth #136</h4>
 -            <h4>Oct 14-16, 2014</h4>
 -            <h4>Las Vegas, Nevada</h4>
 +<!--            <h4>We're exhibiting!</h4> -->
 +            <h5>&nbsp;WISPAmerica</h5>
 +            <h4>Booth #110</h4>
 +            <h4>Feb 23-26, 2015</h4>
 +            <h4>St. Louis,  Missouri</h4>
            </td>
          </tr>
 -
 +<!--
          <tr>
          <td colspan=2><h4>Use coupon code FIS136 for a $50 discount!</h4></td>
          </tr>
 +-->
  
          <tr>
            <td colspan=2>
@@@ -70,6 -70,7 +70,6 @@@
          </tr>
  
        </table>
 --->
  
        <table width="420" height="*" border="0" cellpadding="0" cellspacing="0">
  
@@@ -89,12 -90,16 +89,16 @@@
            <td width="9" height="*" bgcolor="#A5A3A3">&nbsp;</td>
            <td height="*" align="center" valign="top" bgcolor="#A5A3A3"><table width="100%" border="0" cellpadding="2" cellspacing="5">
              <tr align="left" valign="top">
+                 <td width="115" align="right" valign="top"><b>Dec&nbsp;9&nbsp;2014:</b></td>
+                 <td width="*"><a href="/blog/2014/12/freeside-3-5-released/">3.5 released</a></td>
+               </tr>
+             <tr align="left" valign="top">
                  <td width="115" align="right" valign="top"><b>Oct&nbsp;23&nbsp;2014:</b></td>
                  <td width="*"><a href="/blog/2014/10/freeside-3-4-released/">3.4 released</a></td>
                </tr>
                <tr align="left" valign="top"> 
                  <td width="115" align="right" valign="top"><nobr><b>Oct&nbsp;14-16&nbsp;2014:</b></nobr></td>
 -                <td width="*">Exhibited at <a href="http://www.wispapalooza.net">WISPAPalooza</a></td>
 +                <td width="*">Exhibited at <a href="http://www.cvent.com/events/wispapalooza-2014/event-summary-8773af34cc4944efba5cfd664bcce724.aspx">WISPAPalooza</a></td>
                </tr>
  
                <tr align="left" valign="top"> 
@@@ -124,7 -129,7 +128,7 @@@
  
                <tr align="left" valign="top"> 
                  <td width="115" align="right" valign="top"><nobr><b>Mar&nbsp;25-27&nbsp;2014:</b></nobr></td>
 -                <td width="*">Exhibited at <a href="http://www.wispamerica.net/">WISP America</a></td>
 +                <td width="*">Exhibited at <a href="http://www.cvent.com/events/wispamerica-2014/archived-dc9ccd7053d04105a40aacc551fe59fd.aspx">WISP America</a></td>
                </tr>
  
                <tr align="left" valign="top">