Ratcheting z-indexes where necessary
Merge branch 'master' of github.com:punkave/apostrophe-ui-2
z-index gold