test images and luracache
Merge branch 'master' of https://github.com/criswonder/wonderful

Conflicts:
	mcomponent/HongyunBasic/AndroidManifest.xml