profile, infinite scroll changes
Merge remote branch 'origin/dev' into dev