Remove custom styling
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964

Conflicts:
	interface/ui/preferencesDialog.ui
Fix preferences dialog layout
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
Layout fixes
restore default buttons events
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
layout tweaks
Merge branch 'master' of https://github.com/highfidelity/hifi into 19964
Merge pull request #3355 from stojce/19964

Code Review for Job #19964