eee
Merge branch 'master' of https://github.com/gp90n9/test.git

Conflicts:
	ThinkAndroidDemo/src/com/cat/activity/SplashActivity.java