Merge branch 'Upstream_release' into develop
Changed profile filler text to placeholder text

On a slow network the filler text was showing up before being replaced
by the person's bio.
Merge pull request #262 from jamesduffy/develop

Changed profile filler text to placeholder text