new modal styles
Merge branch 'master' of https://github.com/punkave/apostrophe-ui-2

Conflicts:
	public/css/apos-ui.less
	public/css/content.less