by andregriffin: Use media query for tablet/mobile to un-float .form-search when placed within collapsable navigation bar.
Merge branch '7.x-2.x' of http://git.drupal.org/project/bootstrap into 7.x-2.x

* '7.x-2.x' of http://git.drupal.org/project/bootstrap:
  by andregriffin: Use media query for tablet/mobile to un-float .form-search when placed within collapsable navigation bar.