Merge branch 'back' of github.com:Rulingcom/orbit into back

Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb

app/assets/stylesheets/mobile/orbit-mobile.css.erb

@@ -128,13 +128,8 @@ div[data-role="page"] {
 	left: 0;
 }
 .header .language .ui-btn-text i {
-<<<<<<< HEAD
-	font-size: 1.1em;
-	margin-top: .3em;
-=======
 	font-size: .83em;
 	margin-top: .2em;
->>>>>>> Add mobile but remove news in it
 }
 .header .language .ui-icon {
 	background-image: none;

app/controllers/application_controller.rb

@@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base
   rescue_from PageError, :with => :render_page_error
 
   layout :layout_by_resource
-  
+
   helper :admin, :orbit_form
   before_filter :set_locale, :set_site, :prepare_for_mobile
 

app/views/layouts/mobile.mobile.erb

@@ -11,11 +11,7 @@
   <meta name="description" content="">
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
-<<<<<<< HEAD
   <meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0">
-=======
-  <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0">
->>>>>>> Add mobile but remove news in it
   <!-- iPhone -->
   <link href="<%= asset_path 'mobile/apple-startup-iPhone.png' %>" media="(device-width: 320px) and (device-height: 480px) and (-webkit-device-pixel-ratio: 1)" rel="apple-touch-startup-image">
 

app/views/mobile/_footer.mobile.erb

@@ -14,6 +14,7 @@
       <li>
         <%= link_to mobile_dialog_contact_path, {"data-rel" => "dialog"} do %>
           <i class="icons-phone"></i>
+        <% end %>
       </li>
     </ul>
   </div>