profile page
Merge branch 'master' into JellaDivina
profile controller