Conflicts:
	src/switch_channel.c

Conflicts:
	libs/sofia-sip/.update

FS-10189: [core] switch_core_add_state_handler runtime.state_handler_index may exceed SWITCH_MAX_STATE_HANDLERS  #resolve

Conflicts:
	.gitignore
	src/mod/languages/mod_lua/lua/lgc.c

Conflicts:
	Freeswitch.2015.sln

Conflicts:
	w32/Library/FreeSwitchCore.2015.vcxproj

Conflicts:
	html5/verto/js/src/jquery.FSRTC.js
	html5/verto/video_demo-live_canvas/js/verto-min.js
	html5/verto/video_demo/js/verto-min.js

FS-10269: [mod_conference] conference recording pause doesn't work correctly for video -- fix regression from change re: FS-10249

FS-10249: [mod_av] Audio gradually falls behind video in recordings #comment Based on that feedback, please try latest master

FS-10338: [mod_sofia] add sip_invite_stamp variable of the time we received initial invite on an inbound call leg

FS-10328: [freeswitch-core] Add method to allow orphaned B legs during originate to transfer to another extension

FS-10309: [verto_communicator] Add a loader that shows up when check network is called and vanishes when the request is completed.
The button to check network now is disabled when a request is processing.

If no microphone was detected it was impossible to open a call.

So, add a No Microphone label, just like the No Camera, with id:none,
wich allow to enter a call with microphone disabled.

FS-10300: [mod_verto] fix crash in multiple verto messages when processing messages with missing params

FS-10299 [mod_callcenter] Removing global lock on all cc_execute_sql functions when executing database queries

FS-10298 [mod_callcenter] Firing bridge-agent-end if we failed to bridge answered agent with member.

FS-10291: [fs_cli] fs_cli Error indicated on console loglevel debug with extra whitespace before or after debug #resolve

Adding NULL at the end of our fake ARGV string for completeness

FS-10172: mod_event_socket: handle return codes from switch_queue_trypush() , more verbose logging when we cannot enqueue