fixed admin preview/edit toggle icons
fix merge conflict for icons
Merge branch 'master' of http://github.com/punkave/apostrophe

Conflicts:
	public/css/icons.less