[Search, Mobile] Merge

Merged search/master into mobile. Adjusted the
search bar to work on branch and fit accordingly.

platform/commonUI/general/res/sass/_main.scss

@@ -1,3 +1,4 @@
+/*****************************************************************************
 /*****************************************************************************
  * Open MCT Web, Copyright (c) 2014-2015, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
@@ -34,7 +35,6 @@
 @import "fonts";
 @import "user-environ/layout";
 @import "mobile/layout";
-
 @import "fixed-position";
 @import "about";
 @import "text";