중간 컨플릭트 문제 해결한 부분!!!!!!!!
Merge branch 'master' of https://github.com/soma-isuda/isuda-client

Conflicts:
	Framework/app/javascript/MultiWatchPg.js
	Framework/app/javascript/TVSchedulePg.js