resolve conflicts in merging in other branch

diff --cc bootstrap-1.1.0.css
index 1c1db831f04a72f538c91b5a9d7c737c415d249f,d20ff26954e3e7456aed002ac63ef889f7219e73..af511cc656e167529bb74f2a269451cdda18d3cb
--- 1/bootstrap-1.1.0.css
--- 2/bootstrap-1.1.0.css
+++ b/bootstrap-1.1.0.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Thu Aug 25 22:51:24 PDT 2011
 - * Date: Wed Aug 24 23:48:05 PDT 2011
++ * Date: Thu Aug 25 23:12:07 PDT 2011
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here     that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@@ -190,7 -227,7 +270,8 @@@ table 
   * ------------------------------------------------------------------------------------------- */
  .row {
    zoom: 1;
+   margin-bottom: 18px;
 +  margin-left: -20px;
  }
  .row:before, .row:after {
    display: table;
@@@ -319,11 -452,12 +400,12 @@@ body 
    width: 940px;
    margin: 0 auto;
  }
 -div.container-fluid {
 +.container-fluid {
    padding: 0 20px;
    zoom: 1;
+   margin-bottom: 18px;
  }
 -div.container-fluid:before, div.container-fluid:after {
 +.container-fluid:before, .container-fluid:after {
    display: table;
    content: "";
  }

diff --cc bootstrap-1.1.0.min.css
index 937e4537546b991deb141045b9b52cd452a7cc23,ae0cd3430f2fa09a955353c7e40b1d14a0ee2435..d2a0b92e950af80eaa867acbc7a8be62fce6650d
--- 1/bootstrap-1.1.0.min.css
--- 2/bootstrap-1.1.0.min.css
+++ b/bootstrap-1.1.0.min.css
@@@ -7,51 -23,55 +23,60 @@@ table{border-collapse:collapse;border-s
  .clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
  .clearfix:after{clear:both;}
  .center-block{display:block;margin:0 auto;}
- .container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
+ .container{width:940px;margin:0 auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";}
  .container:after{clear:both;}
 -.row{zoom:1;margin-bottom:18px;}.row:before,.row:after{display:table;content:"";}
 +.btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;}
 +.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(#ee5f5b, #c43c35);background-image:-ms-linear-gradient(#ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(#ee5f5b, #c43c35);background-image:-o-linear-gradient(#ee5f5b, #c43c35);background-image:linear-gradient(#ee5f5b, #c43c35);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
 +.btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
 +.btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(#5bc0de, #339bb9);background-image:-ms-linear-gradient(#5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(#5bc0de, #339bb9);background-image:-o-linear-gradient(#5bc0de, #339bb9);background-image:linear-gradient(#5bc0de, #339bb9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
- .row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";}
++.row{zoom:1;margin-bottom:18px;margin-left:-20px;}.row:before,.row:after{display:table;content:"";}
  .row:after{clear:both;}
 -.row .span1{float:left;width:40px;margin-left:20px;}.row .span1:first-child{margin-left:0;}
 -.row .span2{float:left;width:100px;margin-left:20px;}.row .span2:first-child{margin-left:0;}
 -.row .span3{float:left;width:160px;margin-left:20px;}.row .span3:first-child{margin-left:0;}
 -.row .span4{float:left;width:220px;margin-left:20px;}.row .span4:first-child{margin-left:0;}
 -.row .span5{float:left;width:280px;margin-left:20px;}.row .span5:first-child{margin-left:0;}
 -.row .span6{float:left;width:340px;margin-left:20px;}.row .span6:first-child{margin-left:0;}
 -.row .span7{float:left;width:400px;margin-left:20px;}.row .span7:first-child{margin-left:0;}
 -.row .span8{float:left;width:460px;margin-left:20px;}.row .span8:first-child{margin-left:0;}
 -.row .span9{float:left;width:520px;margin-left:20px;}.row .span9:first-child{margin-left:0;}
 -.row .span10{float:left;width:580px;margin-left:20px;}.row .span10:first-child{margin-left:0;}
 -.row .span11{float:left;width:640px;margin-left:20px;}.row .span11:first-child{margin-left:0;}
 -.row .span12{float:left;width:700px;margin-left:20px;}.row .span12:first-child{margin-left:0;}
 -.row .span13{float:left;width:760px;margin-left:20px;}.row .span13:first-child{margin-left:0;}
 -.row .span14{float:left;width:820px;margin-left:20px;}.row .span14:first-child{margin-left:0;}
 -.row .span15{float:left;width:880px;margin-left:20px;}.row .span15:first-child{margin-left:0;}
 -.row .span16{float:left;width:940px;margin-left:20px;}.row .span16:first-child{margin-left:0;}
 -.row .offset1{margin-left:80px !important;}.row .offset1:first-child{margin-left:60px !important;}
 -.row .offset2{margin-left:140px !important;}.row .offset2:first-child{margin-left:120px !important;}
 -.row .offset3{margin-left:200px !important;}.row .offset3:first-child{margin-left:180px !important;}
 -.row .offset4{margin-left:260px !important;}.row .offset4:first-child{margin-left:240px !important;}
 -.row .offset5{margin-left:320px !important;}.row .offset5:first-child{margin-left:300px !important;}
 -.row .offset6{margin-left:380px !important;}.row .offset6:first-child{margin-left:360px !important;}
 -.row .offset7{margin-left:440px !important;}.row .offset7:first-child{margin-left:420px !important;}
 -.row .offset8{margin-left:500px !important;}.row .offset8:first-child{margin-left:480px !important;}
 -.row .offset9{margin-left:500px !important;}.row .offset9:first-child{margin-left:480px !important;}
 -.row .offset10{margin-left:620px !important;}.row .offset10:first-child{margin-left:600px !important;}
 -.row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;}
 -.row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;}
 +.row .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{display:inline;float:left;margin-left:20px;}
 +.row .span1{width:40px;}
 +.row .span2{width:100px;}
 +.row .span3{width:160px;}
 +.row .span4{width:220px;}
 +.row .span5{width:280px;}
 +.row .span6{width:340px;}
 +.row .span7{width:400px;}
 +.row .span8{width:460px;}
 +.row .span9{width:520px;}
 +.row .span10{width:580px;}
 +.row .span11{width:640px;}
 +.row .span12{width:700px;}
 +.row .span13{width:760px;}
 +.row .span14{width:820px;}
 +.row .span15{width:880px;}
 +.row .span16{width:940px;}
 +.row .offset1{margin-left:80px;}
 +.row .offset2{margin-left:140px;}
 +.row .offset3{margin-left:200px;}
 +.row .offset4{margin-left:260px;}
 +.row .offset5{margin-left:320px;}
 +.row .offset6{margin-left:380px;}
 +.row .offset7{margin-left:440px;}
 +.row .offset8{margin-left:500px;}
 +.row .offset9{margin-left:500px;}
 +.row .offset10{margin-left:620px;}
 +.row .offset11{margin-left:680px;}
 +.row .offset12{margin-left:740px;}
  html,body{background-color:#fff;}
  body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
 -div.container{width:940px;margin:0 auto;}
 -div.container-fluid{padding:0 20px;zoom:1;margin-bottom:18px;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";}
 -div.container-fluid:after{clear:both;}
 -div.container-fluid div.sidebar{float:left;width:220px;}
 -div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;}
 +.container{width:940px;margin:0 auto;}
- .container-fluid{padding:0 20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
++.container-fluid{padding:0 20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
 +.container-fluid:after{clear:both;}
 +.container-fluid .sidebar{float:left;width:220px;}
 +.container-fluid .content{min-width:700px;max-width:1180px;margin-left:240px;}
  a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
+ .btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
+ .primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;}
+ .btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
+ .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
+ .btn.small{padding-right:9px;padding-left:9px;font-size:11px;}
+ .btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+ .btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.btn:disabled.primary{color:#fff;}
+ .btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
+ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
  p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
  h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
  h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
@@@ -176,26 -197,20 +202,26 @@@ table .headerSortUp.purple,table .heade
  .hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
  footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
  .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;}
 -.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);border-bottom:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.alert-message p{color:#fff;margin-bottom:0;}.alert-message p+p{margin-top:5px;}
 -.alert-message.error{background-color:#d83a2e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));background-image:-moz-linear-gradient(#e4776f, #d83a2e);background-image:-ms-linear-gradient(#e4776f, #d83a2e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));background-image:-webkit-linear-gradient(#e4776f, #d83a2e);background-image:-o-linear-gradient(#e4776f, #d83a2e);background-image:linear-gradient(#e4776f, #d83a2e);border-bottom-color:#b32b21;}
 -.alert-message.warning{background-color:#ffd040;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));background-image:-moz-linear-gradient(#ffe38d, #ffd040);background-image:-ms-linear-gradient(#ffe38d, #ffd040);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));background-image:-webkit-linear-gradient(#ffe38d, #ffd040);background-image:-o-linear-gradient(#ffe38d, #ffd040);background-image:linear-gradient(#ffe38d, #ffd040);border-bottom-color:#ffc40d;}
 -.alert-message.success{background-color:#62bc62;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));background-image:-moz-linear-gradient(#97d397, #62bc62);background-image:-ms-linear-gradient(#97d397, #62bc62);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));background-image:-webkit-linear-gradient(#97d397, #62bc62);background-image:-o-linear-gradient(#97d397, #62bc62);background-image:linear-gradient(#97d397, #62bc62);border-bottom-color:#46a546;}
 -.alert-message.info{background-color:#04aef4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));background-image:-moz-linear-gradient(#62cffc, #04aef4);background-image:-ms-linear-gradient(#62cffc, #04aef4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));background-image:-webkit-linear-gradient(#62cffc, #04aef4);background-image:-o-linear-gradient(#62cffc, #04aef4);background-image:linear-gradient(#62cffc, #04aef4);border-bottom-color:#049cdb;}
 -.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
 -.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;margin-right:30px;margin-bottom:0;}
 -.block-message ul{margin-bottom:0;}
 -.block-message strong{display:block;}
 -.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;}
 -.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;}
 -.block-message.success{background:#dff1df;border:1px solid #bbe2bb;}
 -.block-message.info{background:#c7eefe;border:1px solid #ade6fe;}
 +.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
 +.btn.primary{color:#fff;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
 +.btn.disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;}
 +.btn:disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;}
 +.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);}
 +.btn.large{font-size:16px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
 +.btn.small{padding:7px 9px 7px;font-size:11px;}
 +button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
 +.alert-message{background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(#fceec1, #eedc94);background-image:-ms-linear-gradient(#fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(#fceec1, #eedc94);background-image:-o-linear-gradient(#fceec1, #eedc94);background-image:linear-gradient(#fceec1, #eedc94);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);margin-bottom:18px;padding:7px 14px;color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message h5{line-height:18px;}
 +.alert-message p{margin-bottom:0;}
 +.alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;}
 +.alert-message .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);}
 +.alert-message .close{float:right;margin-top:-2px;color:#000000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
 +.alert-message.block-message{background-image:none;background-color:#fdf5d9;padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-message.block-message p{margin-right:30px;}
 +.alert-message.block-message .alert-actions{margin-top:5px;}
 +.alert-message.block-message.error,.alert-message.block-message.success,.alert-message.block-message.info{color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
 +.alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;}
 +.alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;}
 +.alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;}
- .tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
+ .tabs,.pills{margin:0 0 20px;padding:0;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
  .tabs:after,.pills:after{clear:both;}
  .tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;}
  .tabs{width:100%;border-bottom:1px solid #bfbfbf;}.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;}
@@@ -208,9 -223,9 +234,9 @@@
  .pagination ul li.next a{border:0;}
  .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}
  .modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
 -.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
 +.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header .close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
  .modal .modal-body{padding:20px;}
- .modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";}
+ .modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:18px;margin-bottom:0;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";}
  .modal .modal-footer:after{clear:both;}
  .modal .modal-footer .btn{float:right;margin-left:10px;}
  .twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}

diff --cc lib/forms.less
index b38163f3388609b3b86dbf30f119e7742c0744c0,cfcdb3f17c44cf0e51484c1209087c24b8ff08cd..88ae08d8a81cfd3a7f46b5887fd0388a1437aa5c
--- 1/lib/forms.less
--- 2/lib/forms.less
+++ b/lib/forms.less
@@@ -268,10 -268,8 +269,9 @@@ input.disabled 
      *margin-top: 1px; /* IE6-7 */
    }
  }
- 
  .input-append {
 -  input[type=text] {
 +  input[type=text],
 +  input[type=password] {
      float: left;
      .border-radius(3px 0 0 3px);
    }

diff --cc lib/patterns.less
Simple merge

diff --cc lib/scaffolding.less
index 6b7fa799faab5b38969b785c17f06236eb43e575,1372306720a12ee1fff4d05993600d08f3eb4eaf..6f1deb3d284e4c5b25a85fe17bc6035452688773
--- 1/lib/scaffolding.less
--- 2/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@@ -115,4 -92,90 +115,90 @@@ a 
      color: @linkColorHover;
      text-decoration: underline;
    }
 -}
+ }
+ 
+ // Buttons
+ .btn {
+   display: inline-block;
+   #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
+   padding: 4px 14px;
+   text-shadow: 0 1px 1px rgba(255,255,255,.75);
+   color: #333;
+   font-size: 13px;
+   line-height: @baseline;
+   border: 1px solid #ccc;
+   border-bottom-color: #bbb;
+   .border-radius(4px);
+   @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+   .box-shadow(@shadow);
+   &:hover {
+     background-position: 0 -15px;
+     color: #333;
+     text-decoration: none;
+   }
+ }
+ .primary {
+   #gradient > .vertical(#049CDB, #0064CD);
+   color: #fff;
+   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+   border: 1px solid darken(#0064CD, 10%);
+   border-bottom-color: darken(#0064CD, 15%);
+   &:hover {
+     color: #fff;
+   }
+ }
+ 
+ .btn {
+   //.button(#1174C6);
+   .transition(.1s linear all);
+   &.primary {
+     //#gradient > .vertical(@blue, @blueDark);
+     color: #fff;
+     text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+     border-color: @blueDark @blueDark darken(@blueDark, 15%);
+     border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
+     &:hover {
+       color: #fff;
+     }
+   }
+   &.large {
+     font-size: 16px;
+     line-height: 28px;
+     .border-radius(6px);
+   }
+   &.small {
+     padding-right: 9px;
+     padding-left: 9px;
+     font-size: 11px;
+   }
+   &.disabled {
+     background-image: none;
+     .opacity(65);
+     cursor: default;
+     .box-shadow(none);
+   }
+ 
+   // this can't be included with the .disabled def because IE8 and below will drop it ;_;
+   &:disabled {
+     background-image: none;
+     .opacity(65);
+     cursor: default;
+     .box-shadow(none);
+     &.primary {
+       color: #fff;
+     }
+   }
+   &:active {
+     @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+     .box-shadow(@shadow);
+   }
+ }
+ 
+ // Help Firefox not be a jerk about adding extra padding to buttons
+ button.btn,
+ input[type=submit].btn {
+   &::-moz-focus-inner {
+       padding: 0;
+       border: 0;
+   }
 +}