add waterfall test project
Merge branch 'master' of https://github.com/criswonder/wonderful
add file
Merge branch 'master' of https://github.com/criswonder/wonderful

Conflicts:
	mcomponent/.DS_Store
	mcomponent/HongyunBasic/AndroidManifest.xml