Adds profile view and invitation_count column to users
Merge latest commits from slave branch.
Fixes conflict