Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Remove custom behavior from chat window
Remove custom styling
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964

Conflicts:
	interface/ui/preferencesDialog.ui
Fix preferences dialog layout
new audio format object
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
Layout fixes
Merge branch 'master' of https://github.com/worklist/hifi
restore default buttons events
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of github.com:highfidelity/hifi into 19968
Add margin to chat window for titlebar + menu
Update chat to close on ESC
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964