Change HTML
Merge pull request #18 from tooooomin/master

Change HTMLマージしました
Merge branch 'master' of https://github.com/fvi-att/MocPlanManga2014 into confirmWindow

# By Tomoko
# Via Tomoko (1) and fvi@ (1)
* 'master' of https://github.com/fvi-att/MocPlanManga2014:
  Change HTML
ver 1.0
merge
Merge branch 'master' of https://github.com/fvi-att/MocPlanManga2014 into confirmWindow

# By =
# Via =
* 'master' of https://github.com/fvi-att/MocPlanManga2014:
  ver 1.0

Conflicts:
	Resources/confirmWindow.js
	tiapp.xml