Merge branch 'master' of https://github.com/sharewave/frontus
switch over profile images
Merge branch 'master' into testing