exception handler play
Merge remote-tracking branch 'origin/master'

Conflicts:
	beautyplan/src/com/trianglegroup/android/beautyplan/ui/TimeMusicActivity.java