force commit
force commit
tiapp.xmlの修正
[add] TemplateImageView.js
[add] images/photo

[change] CreateCommonParts.js
linked
 people button -> TemplateImageView
commit and pick TemplateImageView from 8kkaa
force commit
force commit
remove old file with /images
fix .gitignore
* Added header and footer
* Fixed the length of the tab label
* Added a couple more stub sns buttons
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