hongyunbasic local
Merge branch 'master' of https://github.com/criswonder/wonderapps

Conflicts:
	mcomponent/HongyunBasic/AndroidManifest.xml
	mcomponent/HongyunBasic/bin/AndroidManifest.xml
	mcomponent/HongyunBasic/bin/classes/com/example/hongyunbasic/R$id.class
	mcomponent/HongyunBasic/bin/classes/com/example/hongyunbasic/R$layout.class
	mcomponent/HongyunBasic/bin/classes/com/example/hongyunbasic/R$menu.class
	mcomponent/HongyunBasic/bin/classes/com/example/hongyunbasic/R$string.class
	mcomponent/HongyunBasic/bin/classes/com/example/hongyunbasic/R$style.class
	mcomponent/HongyunBasic/bin/classes/test/AsyncTask_HandlerThread/RockIt.class
	mcomponent/HongyunBasic/bin/classes/test/animation/TestAnimation.class
	mcomponent/HongyunBasic/bin/classes/test/animation/TestAnimation1.class
	mcomponent/HongyunBasic/bin/classes/test/animation/TestAnimation2$DisplayNextView.class
	mcomponent/HongyunBasic/bin/classes/test/animation/TestAnimation2.class
	mcomponent/HongyunBasic/bin/classes/test/animation/TestAnimation3$DisplayNextView.class
	mcomponent/HongyunBasic/bin/classes/test/animation/TestAnimation3.class
	mcomponent/HongyunBasic/gen/com/example/hongyunbasic/R.java
	mcomponent/HongyunBasic/src/test/scrolllayout/VerticalScrollBounceView.java
shit
add ignore
Merge branch 'master' of https://github.com/criswonder/wonderapps
edit conflict
Conflicts:
	auto/AHibernate/.classpath
	auto/AutoExhibition/res/values/dimens.xml
	auto/ImageViewTouch/.classpath