* commit '37df3ee6':
  FS-8015 --resolve - Add project dir to include for mod_conference so it picks up mod_conference.h.

* commit 'be73c4f1':
  FS-8009 #resolve Create a grunt project with livereload support. From now on, use npm install && grunt serve to develop on this project.

FS-8009 #resolve Create a grunt project with livereload support. From now on, use npm install && grunt serve to develop on this project.

Merge pull request #404 in FS/freeswitch from ~JONATASOLIVEIRA/freeswitch:bugfix/FS-7977-selecting-the-highest-supported-resolution-isnt-working to master

* commit '880fb810':
  FS-7977 - [Verto Communicator] Fixing default resolution and cleaning code

FS-7932 - removed the param from the getMute funciton in verto class, not needed on underlying method

Merge pull request #403 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:opus-fix-plc-init to master

* commit 'ecabfc7f':
  FS-8005: mod_opus : fix for rare decoder error when doing PLC, OPUS_GET_LAST_PACKET_DURATION might return 0

Merge pull request #399 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:telephone-event--adv_rm_rate-fix2 to master

* commit 'a0a43ab1':
  FS-7971 : adv_rm_rate (telephone-event and CN)

FS-8005: mod_opus : fix for rare decoder error when doing PLC, OPUS_GET_LAST_PACKET_DURATION might return 0

FS-7988 FS-7989 add debug mode to fixbug and filebug and add -project to filebug and add -append and -comment to fixbug to append to defualt commit msg

FS-7969 #resolve [Freeswitch segfaults due to pthread_setschedparam() on a thread that has exited] #comment please test this fix which was verified working

Merge pull request #398 in FS/freeswitch from ~GIGGSEY/freeswitch:bugfix/FS-7968-verbose-events-for-voicemail to master

* commit '5802ba71':
  Fix record-greeting event missing VM-Greeting-Path

FS-7975 #resolve

* commit 'd6e5dc64':
  FS-7970 Fixed crash in video_bug_thread caused by double free