Merge branch 'master' into social_stream
added read_stream permission
Merge branch 'social_stream' into testing