modal tweaks, add check to see if admin menu is open before auto-collapsing it
Merge branch 'master' of https://github.com/punkave/apostrophe-ui-2