Style sheet modification #5
Merge branch scream #5

Conflicts:
	app/assets/javascripts/scream/application.js
	app/assets/javascripts/scream/contents.js
	app/assets/javascripts/scream/iframe_contents.js
	app/assets/javascripts/scream/ori/contents.js
	app/assets/javascripts/scream/ori/iframe_contents.js
	app/assets/ori_java/contents.js
	app/assets/ori_java/iframe_contents.js
	app/assets/ori_style/application.css
	app/assets/ori_style/contents.css
	app/assets/ori_style/iframe_contents.css
	app/assets/stylesheets/scream/application.css
	app/assets/stylesheets/scream/contents.css
	app/assets/stylesheets/scream/global.scss
	app/assets/stylesheets/scream/iframe.css
	app/assets/stylesheets/scream/iframe_contents.css
	app/assets/stylesheets/scream/ori/application.css
	app/assets/stylesheets/scream/ori/contents.css
	app/assets/stylesheets/scream/ori/iframe_contents.css
	app/controllers/scream/application_controller.rb
	app/views/layouts/scream/application.html.erb
	spec/dummy/log/development.log
Stylesheets added #5