Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java

@@ -153,7 +153,7 @@ public class RoomManager {
 		
 		rm.add(p);
 		
-		if ((rm.numParticipants() == 1) && (rm.record())) {
+		if ((rm.numParticipants() == 1) && rm.record() && !rm.isRecording()) {
 			/**
 			 * Start recording when the first user joins the voice conference.
 			 * WARNING: Works only with FreeSWITCH for now. We need to come up with a generic way to

record-and-playback/simple/scripts/publish/simple.rb

@@ -105,5 +105,6 @@ if (playback == "simple")
 		index_html = File.new("#{publish_dir}/index.html","w")
 		index_html.write(html)
 		index_html.close
+    File.chmod(0644, "#{publish_dir}/index.html")
 	end
 end