test

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

Conflicts:
	tiapp.xml
header,footer export
EditPicture and AddNewManga
Merge pull request #6 from NJnb6/moc2014_header_footer_export_jnb

Merged 201309230800
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 :)
replace var uiconfig @commonPart and unify to global module var
all merge
Merge branch 'Merge0920'

Conflicts:
	Resources/CommonNavigationWindow.js
Merge branch 'master' of https://github.com/fvi-att/MocPlanManga2014

# By = (5) and others
# Via = (4) and others
* 'master' of https://github.com/fvi-att/MocPlanManga2014:
  all merge
  replace var uiconfig @commonPart and unify to global module var
  forcecommit I will add it to gitignore :)
  commit sasatomo change at CNW.js
  remove log file
  EditPicture and AddNewManga
  header,footer export
  test

Conflicts:
	tiapp.xml