don't push CSS, only LESS
Merge branch 'master' of http://github.com/punkave/apostrophe-editor-2

Conflicts:
	public/js/vendor/ckeditor/skins/apostrophe/editor.css