Merge branch 'master' into desktop_harry

Conflicts:
	app/assets/stylesheets/style.css.erb

app/assets/javascripts/new_admin.js

@@ -11,4 +11,5 @@
 //= require jquery.tinyscrollbar.min
 //= require orbit-1.0
 //= require tinymce-jquery
-//= require tinymce_orbit
+//= require tinymce_orbit
+//= require orbit-bar-search

app/assets/javascripts/orbit-bar-search.js

@@ -0,0 +1,20 @@
+$(document).on('click', '.orbit-bar-search', function (){
+	if ($(this).parents('.search').hasClass('visible')){
+		$(this).parents('.search').stop().animate({
+			'width':'28px',
+		});
+		$(this).parents('.search').css({
+			'background-color': 'transparent',
+		});	
+		$(this).parents('.search').removeClass('visible');	
+	}
+	else{
+		$(this).parents('.search').stop().animate({
+			'width':'265px',
+		});
+		$(this).parents('.search').css({
+			'background-color': 'rgba(0, 0, 0, 0.5)',
+		});
+		$(this).parents('.search').addClass('visible');
+	}
+});