ll
Merge branch 'master' of
https://github.com/caijia/Project_Development.git

Conflicts:
	AnimationVideo/src/com/cs/animationvideo/MainActivity.java