Merge branch 'master' into dev
removes html
Signed-off-by: Sho Nakatani <lay.sakura@gmail.com>
Merge branch 'dev'