Merge pull request #189 from jwendl/master

Fixing issue #185 and static analysis build issues.
Merge pull request #44 from Magenic/master

Merge from Master
Merge pull request #190 from jwendl/master

Fixing issue #184
Merge pull request #45 from Magenic/master

Merge from main.
#181 Added the ability to lock down certain activities so only managers or administrative users can enter them.
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.
#181, Made changes so managers and administrators can add activities on behalf of a given employee.
Merge pull request #192 from Bowman74/master

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

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

merging into my local branch