update life and add photo stream
Merge branch 'develop'