update lifestream
Merge branch 'develop'