test

test
Merge branch 'master' of github.com:fvi-att/MocPlanManga2014 into AddCreateNewMangaWindow.js

Conflicts:
	tiapp.xml
EditPicture and AddNewManga
remove log file
Merge branch 'Merge0920' of github.com:fvi-att/MocPlanManga2014 into Merge0920

Conflicts:
	build.log
Merge branch 'EditPictureWindow+AddNewMangaWindow' of github.com:sasatomom/MocPlanManga2014 into sasatomo-Edit

Conflicts:
	Resources/CommonNavigationWindow.js
	build.log
commit sasatomo change at CNW.js
forcecommit I will add it to gitignore :)