Merge branch 'tooltip-arrow' of https://github.com/brnrdog/bootstrap into brnrdog...

diff --cc js/src/popover.js
Simple merge

diff --cc js/src/tooltip.js
Simple merge

diff --cc scss/_popover.scss
Simple merge

diff --cc scss/_tooltip.scss
index e8151af07db98e0994bad19a2906e0a9ee415849,23a18e7deeb8fd04ebab23c9f05c274e15584b27..37d296419bce4dc6a723bcfe6a5c1a1c8dc0f95e
--- 1/scss/_tooltip.scss
--- 2/scss/_tooltip.scss
+++ b/scss/_tooltip.scss
@@@ -16,9 -14,9 +16,9 @@@
    &.tooltip-top,
    &.bs-tether-element-attached-bottom {
      padding: $tooltip-arrow-width 0;
 -    margin-top: -3px;
 +    margin-top: -$tooltip-margin;
  
-     .tooltip-arrow {
+     .tooltip-inner:before {
        bottom: 0;
        left: 50%;
        margin-left: -$tooltip-arrow-width;
@@@ -29,9 -28,9 +30,9 @@@
    &.tooltip-right,
    &.bs-tether-element-attached-left {
      padding: 0 $tooltip-arrow-width;
 -    margin-left: 3px;
 +    margin-left: $tooltip-margin;
  
-     .tooltip-arrow {
+     .tooltip-inner:before {
        top: 50%;
        left: 0;
        margin-top: -$tooltip-arrow-width;
@@@ -42,9 -42,9 +44,9 @@@
    &.tooltip-bottom,
    &.bs-tether-element-attached-top {
      padding: $tooltip-arrow-width 0;
 -    margin-top: 3px;
 +    margin-top: $tooltip-margin;
  
-     .tooltip-arrow {
+     .tooltip-inner:before {
        top: 0;
        left: 50%;
        margin-left: -$tooltip-arrow-width;
@@@ -55,9 -56,9 +58,9 @@@
    &.tooltip-left,
    &.bs-tether-element-attached-right {
      padding: 0 $tooltip-arrow-width;
 -    margin-left: -3px;
 +    margin-left: -$tooltip-margin;
  
-     .tooltip-arrow {
+     .tooltip-inner:before {
        top: 50%;
        right: 0;
        margin-top: -$tooltip-arrow-width;