Profile pages added
Merge branch 'dev' into profile
Merging