few updates with fb integration and some other changes in user and supports data to android

Conflicts:
	vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb

app/views/desktop/index.html.erb

@@ -4,7 +4,6 @@
       <li class="d_cate"><a callback-method='initializeDesktop' href="desktop/desktop" class="widget_fn wh2 hh2" id='home' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
       <ul class="dock_child hh2 thmc4" style="width: 180px;">
         <li class="dock_item"><a callback-method='initializeAppManager' href="<%= desktop_app_manager_path %>" class="widget_fn wh2 hh2" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
-        <li class="dock_item"><a callback-method='initializeSectionsManager' href="<%= desktop_allsections_path %>" class="widget_fn wh2 hh2" id="d_sections" custom-load="sections" onclick="return false;"><span class="widget_icon"><img src="" alt="All Sections" id="sections_icon" width="30" height="30"/></span></a></li>
         <li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" custom-load="settings" class="widget_fn wh2 hh2" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
       </ul>
       </li>

app/views/desktop/settings/connections.html.erb

@@ -1,6 +1,9 @@
 
-		<div id="connection_setting" class="overview vp">
-			<ul class="s_form w2 hp" id="facebook_connection">
+		<div id="connection_setting" class="overview vp" content-layout="simple"> 
+			<a href="" onclick="window.open('<%= @url %>','login_window','height=250,width=400,titlebar=0,statusbar=0,location=0');return false;">Connect FaceBook</a>
+
+			<a href="/facebook/get_friends" ajax-remote="get" >Get Friends</a>
+			<!-- <ul class="s_form w2 hp" id="facebook_connection">
 				<li><span class="c_status">No Connection</span></li>
 				<li><img src="/assets/connection/facebook.png" alt="" class="c_icon"><h1 class="c_name">Facebook</h1></li>
 				<li><label for="">Account</label><input type="text"></li>
@@ -35,7 +38,7 @@
 						<a href="gmail" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="delete" style="display:none;">Remove</a>
 					</div>
 				</li>
-			</ul>
+			</ul> -->
 		</div>
 		<!-- <div style="z-index:999;position:relative;"><button onclick="o.tempFunc()">Twitter</button> -->