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

Conflicts:
	Framework/app/javascript/Main.js
	Framework/app/javascript/Player.js
	Framework/app/javascript/SelectWatchPg.js
	Framework/index.html