Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into develop

Conflicts:
	.gitignore

diff --cc .gitignore
index cb47cd1,c97ebdb..9951a1d
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,5 @@@
- templates/compiled/template.html.en.php
- templates/compiled/template.html.gettext.serial
++compiled/
 +.htaccess
+ /nbproject/private/
+ /nbproject/project.xml
+ /nbproject/project.properties

diff --cc Toolkit/Template/Image/Left.php
index 6fb37f1,6fb37f1..db621d9
--- 1/Toolkit/Template/Image/Left.php
--- 2/Toolkit/Template/Image/Left.php
+++ b/Toolkit/Template/Image/Left.php
@@@ -45,7 -45,7 +45,7 @@@ class Toolkit_Template_Image_Left exten
        {
                $imageData = $this->_adapter->getImageSize($size . $this->_src);
  
--              $html  = '<div class="imageleft" style="width: ' . $imageData[0] . 'px;">';
++              $html  = '<div class="left toolboximg" style="width: ' . $imageData[0] . 'px;">';
                $html .=        parent::getImage($size);
                if (!empty($this->_caption)) {
                        $html .=        '<div class="imagecaption">';

diff --cc Toolkit/Template/Image/Right.php
index f1ef03b,f1ef03b..829ba94
--- 1/Toolkit/Template/Image/Right.php
--- 2/Toolkit/Template/Image/Right.php
+++ b/Toolkit/Template/Image/Right.php
@@@ -45,7 -45,7 +45,7 @@@ class Toolkit_Template_Image_Right exte
        {
                $imageData = $this->_adapter->getImageSize($size . $this->_src);
  
--              $html  = '<div class="imageright" style="width: ' . $imageData[0] . 'px;">';
++              $html  = '<div class="right toolboximg" style="width: ' . $imageData[0] . 'px;">';
                $html .=        parent::getImage($size);
                if (!empty($this->_caption)) {
                        $html .=        '<div class="imagecaption">';

diff --cc styles.css
index e3014e2,e3014e2..f49c6ee
--- 1/styles.css
--- 2/styles.css
+++ b/styles.css
@@@ -174,6 -174,6 +174,17 @@@ body 
  #toolbox h1 {
      text-transform: uppercase;
      }
++.right.toolboximg {
++    padding: 0 0 20px 20px;
++    }
++.left.toolboximg {
++    padding: 0 20px 20px 0;
++    }
++.imagecaption {
++    padding: 10px;
++    font-size: 12px;
++    font-style: italic;
++    }
  /* Block / Home Page Headlines */
  #hHlines ul, #hHlines li {
      list-style-type: none;