Merge branch 'stable' into branch-v0.3

Conflicts:
	app/models/user.rb

app/models/user.rb

@@ -83,16 +83,16 @@ def profile!
       profile
     end
   end
-  
+
   def create_bbb_room
     create_bigbluebutton_room :owner => self,
                               :server => BigbluebuttonServer.first,
                               :param => self.login,
                               :name => self._full_name,
                               :logout_url => "/feedback/webconf/"
   end
-  
-  def update_bbb_room    
+
+  def update_bbb_room
     if self.login_changed?
       bigbluebutton_room[:param] = self.login
     end
@@ -280,6 +280,7 @@ def accessible_rooms
     rooms += self.spaces.map(&:bigbluebutton_room)
     rooms += Space.public.map(&:bigbluebutton_room)
     rooms.uniq!
+    rooms
   end
 
 end