update
Merge branch 'master' of https://github.com/shuishou/testgit

Conflicts:
	TestGit/AppDelegate.h