提交前，暂存
Merge branch 'master' of github.com:LOLTeams/BabyHome

# By litch
# Via litch
* 'master' of github.com:LOLTeams/BabyHome:
  uicollectionview接通添加照片
  添加UICollectionView
  编辑完成后回调到订单详情，传回imgModel

Conflicts:
	BabyHome/Scenes/NewOrderController/NewOrderController.m
	BabyHome/Scenes/NewOrderViewController/PhotoEditerController/EditerViewController.m