Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/CustomRichTextEditor.as

A few fixes for event socket differences between FreeSWITCH 1.4 and 1.6

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js

replace font tag on formatted shared notes by the span style attribute; remove textformat tag; improve readability

Updated faulty PDF file conversion mechanism

- Extract the PDF page to a single PDF file.
- Convert the PDF file to a PNG image.
- Conert the PNG image to a SWF file.

changed the method of pack and unpack the encrypted format, from zip to tar, and making it by an external command instead of doing it in ruby (more efficient)

sanitize the parameters of resizeAndMoveSlide, so MeetingActor won't throw an Exception because of NaN

UI improvements and bug fixes

Conflicts:
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee

Revert back pdf2swf conversion option to 'poly2bitmap'

Update create.jsp

Removed test code in create API example.

Escaped username string displayed to prevent JavaScript injection.
Fixes #2913 

 - sometimes we see multiple wav files on recorded meetings. This was…

Document conversion update using swfdump and NuProcess library

- Implemented a new logic for detecting heavy converted swf files from PDF, using obejct placements, text and bitmap count.
- pdf2swf conversion fallback to 'bitmap' instead of 'poly2bitmap' to garantee that file can be opened fast with flash player.

change attribute on bbb_webrtc_bridge due to a new version if sip.js, from iceGatheringTimeout to iceCheckingTimeout

Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/sip.js