frog smile
Merge branch 'wenson' into develop

Conflicts:
	myForg/bin/classes/com/example/myforg/MainActivity.class
	myForg/res/layout/activity_main.xml
Frog can smile , intent to mainActivity
Merge branch 'wenson' into develop