Load on carrousels
Merge branch 'master' of github.com:ging/vish_editor

Conflicts:
	public/vishEditor/stylesheets/all/editor.css