category alarm get
Merge branch 'master' of https://github.com/soma-isuda/isuda-client

Conflicts:
	Framework/app/html/MyPg.html
	Framework/app/javascript/MyPg.js
	Framework/app/stylesheets/MyPg.css