KAZOO-3130: leak is_reseller for superduper admin
3.16: fix arg order in whapps_conference:update/2
KAZOO-3181: updated the conference entry/exit prompts
Timezone changes in Russia
Merge pull request #656 from onnet/KAZOO-3180

Timezone changes in Russia
Merge pull request #655 from stormqloud/master

fr-ca language pack
Merge pull request #654 from 2600hz/KAZOO-3130

KAZOO-3130: leak is_reseller for superduper admin
Merge pull request #5 from 2600hz/master

update