profile changes
Merge conflict resolution profile page
Fixed all merge, style, gemfile and database conflicts