Merge pull request #12 from ikounakis/confirmWindow

Improved confirmation window　マージ完了しました。
build log commit
Merge branch 'Merge0920'

Conflicts:
	build.log
	build/android/bin/app-unsigned.apk
	build/android/bin/app.ap_
	build/android/bin/app.apk
commit 0924 3am
build file merge
force merge
Merge branch 'Merge0920' of github.com:fvi-att/MocPlanManga2014 into Merge0920

Conflicts:
	build.log
	build/android/bin/app-unsigned.apk
	build/android/bin/app.ap_
	build/android/bin/app.apk
	build/android/bin/assets/index.json
merge toomin's HTML swapping
build/ remove
0925 begin
0925_start
bug fix at input method focus and
hide navigation bar
remove old app icon
editPicture modify
Merge branch 'master' of github.com:fvi-att/MocPlanManga2014 into 0925_bugfix
fUC·µւ¦\è
EditPictureWindow modify
Merge pull request #14 from NJnb6/EditPictureWindow_modify

マージしました
bug fix
Merge branch 'Merge0920'