joyride en viewer
joyride in viewer
Merge branch 'master' of github.com:ging/vish_editor

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