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