Merge pull request #81 from rfellows/develop

BISERVER-8947 - merging in more Crystal theme changes from UX
BISERVER-8947 - merging in more Crystal theme changes from UX for the bootstrap theme