Merge branch 'master' into hotfix-jumptocurrentactivity
Cleanup and hide status and options in normal and employee views.
For employees, jump to the current activity listing.
Spellchecking.
For normal users, jump to the current activity listing.
Merge branch 'hotfix-jumptocurrentactivity'