0714
Merge branch 'master' of https://github.com/shenjiaxiong/Photo

Conflicts:
	Photo/ContentVC.m