tracking view.html.erb
Merge branch 'view-selection' of https://github.com/phgrads/SceneStudio into view-selection

Conflicts:
	app/views/scenes/view.html.erb