Merge branch 'development' into release-0.1
Getting profile pic working
Merge branch 'release-0.1' into development