no message
Merge branch 'master' of https://github.com/soma-isuda/isuda-client

Conflicts:
	Framework/app/javascript/MultiWatchPg.js
	Framework/app/javascript/TVSchedulePg.js
	Framework/app/stylesheets/Main.css