Merge pull request #227 from jeffreythomas/dev

BISERVER-8498 - PUC Toolbar buttons in wrong order in Firefox Browser
BISERVER-8498 - PUC Toolbar buttons in wrong order in Firefox Browser