?
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
Merge remote-tracking branch 'upstream/master'
New ayoshitake.com portal
Merge bob/master; remove some unnecessary files; tweak TG record tooltips