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;