Fix merge conflict.
Merge branch 'master' of github.com:rondale-sc/image_viewer_rails into add_jasmine_tests

Conflicts:
	app/assets/javascripts/image_viewer_rails/image_viewer.js
Remove unused icon css.
Update css and js vars to comply with standards.

Scoped css variables to image-viewer-<thing>