add event demo.
Merge branch 'master' of github.com:erhu/android-demo

Conflicts:
	AndroidManifest.xml
	android-demo.iml