Profile pic on menu
Merge branch 'develop' into staging