Merge pull request #191 from Bowman74/master

#181 Added the ability to lock down certain activities so only managers or administrative users can enter them.
Merge pull request #192 from Bowman74/master

#181, Made changes so managers and administrators can add activities on ...
Merge pull request #193 from Bowman74/master

#85, Changes for production release.
Merge pull request #48 from Magenic/master

merging into my local branch
Fixing issue related to compatibility mode for intranet sites.
Merge pull request #195 from jwendl/master

Fixing compat issues.
Merge pull request #46 from Magenic/master

Merge from main