Worked on permissions disabling certain actions.  Only have to make actual work for update permission now.  Also made small edits to Permission Panel trying to gray out the admin and the current user.  This capability is not implemented
Merge conflict resolution
More merge conflict resolution