allowed for content to display based on user groups and incorperated a working navigation bar based on user permissions
merge master