添加觀察者
Merge branch 'master' of https://github.com/simaben/videoplayer

Conflicts:
	AndroidManifest.xml
	res/layout/activity_main.xml
	res/layout/main_header.xml
	res/menu/action_menu.xml
	res/values/strings.xml
	src/com/smb/player/Main.java
	videoplayer.iml