java file
Merge commit '0e45' into wangguio

Conflicts:
	proj.android/src/com/liyong/wangguo/HelloLua.java
plist file
Merge commit 'b144' into wangguio

Conflicts:
	Resources/images/blue.plist
	Resources/images/bold.plist
	Resources/images/red.plist
	Resources/images/white.plist
	Resources/images/yellow.plist
remove cachedFiles
config files
NewUser
New User View
Fix loading
Add Wall To City
Upload New Editon
SOldier attack
cpp files
add store buy gold  show offers!! use gold replace crystal or silver to
buy building
New Youmi offerwall need disable debug mode
adjust Building soldier levelexp data
add Crystal Defensive building